Fix up time stamps