Some escaping fixes