Fixes

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

Fixes #363 (closed) and I think fixes the issue brought up in !3042 (merged)

Merge request reports