Fixed some bugs
Merge branch 'master' of github.com:BaobabHealthTrust/migration_imports