Fixes for facts
Merge branch 'fix/facts1'