More fixes for fact exports