2 small fixes for metaclass and import usage