[M120 Migration] Fix SVACE major issues.