fix a couple more bugs with dollar mixins