Fixing Core -> Mixins linting warning/errors