Misc clean up and other minor changes