Fixed some minor problems with the parsers