migration-fixes

migration fixes