A bunch of minor fixes

Bits and pieces predominately nits that cause warnings or make noise in the output.