Mixin improvements
Fix selector