Fix Timeleft messages