Fixing timestamps