Fix to previous commit

Some fixes to previous timestamp-related commit.