Fix some escaping issues.