Merge "Fix static analyzer warnings"