Fixes for timers.