Fixing some issues when building the live stream list.