More fixes (closer to working gmsh input)