Some warning cleanups