Some minor changes to the timer code.