Picker fixes