[Mesh] Hardening & build tweaks