more escaping related fixes