Fixed problems with DatePicker