Updated mixins to resolve Codekit compiling issue