More Selector Fixes