Fixes for timepicker