Fix svace 2.2 version issues