Fix syntax errors due to single quotes in messages