Improve combat timers