Fixes after review

Raffaele Luccisano requested to merge review-2-41-0-rc-1 into master Apr 09, 2024