Fixes for date and time pickers