Some fixes on the picker