Database migration tools - Fixing up issues.