Fixed issues with the timepicker