Cleanup of issues found by static analysis tooling