Minor fixes
Description
During the development of the pomeron branch, I fixed some minor issues.
Test Plan
CI passes
Additional Checklist Items
-
I have updated documentation as needed -
I considered if this should be cherry-picked/ported somewhere else (rel-2-x or master), and if yes, opened a corresponding issue or MR