patches to fix all the bugs in MVA ID