Misc changes to selection logic