A couple forgotten files.
more warning cleanups