Fixed svace defects