TimePicker fixes