Fixed various expression parsers