Fixing code analysis errors.