More changes and a fix