A few more selector fixes