More selector fixes