Fix live stream issues