Missed some string substitutions