One more thought which I just posted on another thread, but will repeat. Make sure your waist belt is unbuckled and shoulder straps semi-loose if you go in and have to dump your pack quickly. This is for anything over water -- log crossings, wading, snow bridges. Have a Plan II, know what your run out is and, if it's rapids, white water or cascade, maybe you don't want to be there... .
thanks,
g.