More changes, fixes, etc.