Fix up some escaping