fix timestamp helpers