small improvements in aqueducts: solve problem with crashes