More fixes for metatype registration