Fixes to Mesh