[core] Add sonar fixes

This PR introduce some small updates related to Sonar Cube code analysis tool reports. The scanning was performed on SLB side and similar changes were introduced in order to confirm reported issues will be resolved once relevant updates introduced.