Minor warning cleanups