Bug fixes with GeometryDrawing