Voronoi Mapping fixes