Final changes to writing timestamps