Add minor fixes to Datepicker

As title describes