Fix string errors reported by Christian Kirbach