two fixes for mesh manager