more tweaks

Pregmodderrequested to merge
Pregmodder/fc-pregmod:pregmod-dev into pregmod-master

Part of !8912 (merged) that I forgot to push.

Merge request reports