Fixed lexing/parsing bugs