Fixed up parser to be able to compile