More corrections to timestamp handling.