Fixed parsers some bugs