More metatype fixes