Datepicker/Timepicker fixes