More changes and fixes