Better mixins, defines fixes