fix timings on shutdown functions