Additional fixes to escaping mode.