Structural fixes in JTS