More escaping fixes