Fix old timestamp utils