Cleaning up some warnings and other minor things.