More warning cleanups...