mcdermott selector fixes