Fixed some escape character problems