First few bugfixes for Geometry2d