Fixes + FS work

@pregmodfan

Got the preg >= 36 as ordered.

Merge request reports

Loading