Fixed some bugs in the expression parsing system