Fixed some escape character issues