[Tools] Fix Sonarcloud issues

Description

This commit contains Sonarcloud fixes for some issues spotted after merging !1032 (merged)

Checklist

• Documentation reflects the changes made.
• Merge Request title is clear, concise, and suitable as a changelog entry. See our contributing docs

References