Fix countdown bugs