Minor changes to lexer and adapter