More warning cleanups