Fixes issues raised in MR !21171
The MR !21171 (merged) was merged to make the CI look ok. This MR fixies issues spot in the review. Fixing them now so they are not forgotten. Tagging @rbielski and @tamartin
The MR !21171 (merged) was merged to make the CI look ok. This MR fixies issues spot in the review. Fixing them now so they are not forgotten. Tagging @rbielski and @tamartin