ACCESS: Fix definition of river data structures