More changes for some stuff