CountDown fixes