Comingsoon fixes