[selectors] Some fixes from SimonSapin.