Fixed more mixin issues.