Bug fix for parser
More bug fixes for the parser.