Changes to escaping