Fix broken parsers