Fixes for time-picker and default times