Fix Up Timestamp Bugs
Fix Up Timestamp Bugs