More string escape fixes