Bug 16371: Fix inconsistencies with timestamp