ACCESS: Minor river code clean up and saving fix