Fix escaping
Fix specs