<a title="Apply fixes from CodeFactor" href="https://github.com/opencor/opencor/pull/2226">PR #2226</a>: Apply fixes from CodeFactor