Clean up the last few warnings

The build is now warning-free!