Add some escaping