more timepicker fixes