Just a few various clean up changes