Fixes diagonal merging
Fixes conversion between fsd and polygon (and therefore fixes sp check)