Misc Cleanup

See commit messages for details