fixes and overrides

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

Merge request reports