Fixes

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

Fixes #690 (closed), and at least one error in the options macro. These linters are creating more errors than they're fixing.

Merge request reports