Fix lexing bugs