more escaping fixes