Fix a few lexer bugs