Fix timestamp issues cc @kaelig