Bug fixes

Blank_Altrequested to merge
Blank_Alt/fc-pregmod:bugFixes into pregmod-master

Fixes #2709 (closed) and #2711 (closed) along with potential future issues.

Edited by Blank_Alt

Merge request reports