Fixes

svornostrequested to merge
svornost/fc-pregmod:pregmod-master into pregmod-master

Fix a few things called out by typescript.

Merge request reports