Picker intent fixes