Final fixes to the parser for now