Cleaned up some warnings.