Fixup warnings

Browsing the code, fixed up a few warnings.