Fixed a few warnings, no functional changes