Pickadate fixes