Fix Svace defects in gerrit