Redoing fixes

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

For real this time, fixes #254 (closed)

Merge request reports