More fixes for fact exports
Merge pull request #208 from michaeltchapman/zuul

More fixes for fact exports