Fixing various parser-related things