Add some missing escaping