onlyUsedOnce fixes

Arkerthanrequested to merge
Arkerthan/fc-pregmod:fix into pregmod-master

first batch of fixes, most are simple but a few might need discussion.

Merge request reports