Fixes to data migration scripts
db script updates