Picker Fixes