Nope , my old fortress keep with the same problems
But was most for massive terraforming i did and earth walls
Doing a minimal of terraforming and just a moat in other games goes great