Fix svace 2.2 issues