Adapting code to last version of Manifold (1.7-SNAPSHOT)