Fix some warnings from code-analysis.