Countdown fixes