Fixes to Waterfowl problems for David.