Fixing some escaping