Fix some static analysis issues.