Minor change
Fix some static analyzer warnings.