Fixing short and default formats for Time and Date