Mesh: Fix the svace issues