More changes to things