More changes

Various and sundry