Added some shape fixing tools. Does not appear to solve current issue.