Even more const strings and fix to bugfix.
3 files changed