Fix SVACE defects