Fix issues when dealing with a live stream vs saved data