Selector fixes.