More bugfixes for mesh contraint