Minor fixes around escape characters