Mixin tweaks