A little bit of QA
Fix bad string scaping