Migrator fixes for multiple DBs