Fixing static analysis issues.