Minor selector fixes