Changes to fix connection issues during migration of forms