Fixed some missed mixin conversions
Converting more upstream changes
SHA: 46a424fc938d26a344f5cca1aab6004eaaa4a787