More changes/fixes