Fixed some of the expression parsing functions