Fix timestamp errors once and for all