Fixes for metaclass syntax