A very small commit, but let's do all the string corrections while I am already at it :-) Wraps up #510