Even more fixes for mixin files