Misc Changes

More changes to clean up