Fixes to the lexer