Fixes to timestamp issue.