[NUI] Fix svace issues