Various selector fixes