Update timers and fix issues