[NUI] Fix Svace issues