Minor selector improvements