Minor tweaks to level select