Yeah it's a bit fiddly when the water is touching a barrier. I find that I can edit the barrier above the waterline and make it higher, or go to water level. But often it will also say it can't be edited. It should usually be too tricky to remove the water then put it back once you have changed the barrier.