Cleaned up a few compiler warnings.
Cleaned up some more warnings.