Two additions to user-select mixin