Adjust to new timer.h