Clean up some warnings.

Still many more to go.