Fix singlequote issues