Fixes

kopareignsrequested to merge
kopareigns/fc-pregmod:fixes into pregmod-master

Caught one more that !3515 (merged) missed, plus some similar errors in the pit.

Merge request reports