[Svace] Resolve unresolved svace issues