fixes for modelMixin