Escaping fixes