Fixing the issues in DE Form Migration