Minor Fixes

- Fix timestamp