More changes we needed for the live site