Re-enable mixin and fix some bugs