Fix minor escaping issues