More changes and fixes II