Improve flood control a bit