Fix date time stamp display issues