Flood Returns: Bug fixes.

Bug fixes.