[3.0] Fix SVACE issues