Clean up analyzer warnings