Minor fixes around escape characters
Fixed merges