Cleanup warnings. No operational changes.