Minor improvements to gallery picker.