More changes I missed