Warning fixes

Miscellaneous warning fixes.