A few warnings cleanups, no functional changes