Clean up more warnings.