More picker tweaks