Fix some escaping