remove warnings

Fixing a few warnings.

I've been sitting on some of these warning fixes for a week or two waiting for some other PR's to clear.