Fixed rivers ending too soon when getting close to the ocean (regression from all the recent changes)