Bugfixes in expression parsing