More changes

More misc changes