Minor changes to compile, and to clean up just a bit.