fix some overly selective selectors