Some count down fixes