I've heard that blowing the water back out of the tube into the water bladder helps.
For containers try 2manybikes post in this thread
http://www.bikeforums.net/showthread...1&page=4&pp=25
You can find them at target.
I still need to try these solutions.