Fixing code analysis issues.