Fix waterflow and redstone circuits