Fixes to lexer/parser