SF-corrections

Blank_Altrequested to merge
Blank_Alt/fc-pregmod:SF-corrections into pregmod-master

Minor cleanup and also fixes the relevant part of #2534 (closed).

Merge request reports