Datepicker fixes
DatePicker Fix