Datepicker fixes