Fix a few bugs with picker