More small fixes for timer.