Fixes related to countdown timer