Here's a patch against 2.0 which should fix both problems plus
another one I found related to umounting a read-only mount that
had recovery associated with it. Please test.
fetch http://apollo.backplane.com/DFlyMisc/hammer01.patch
-Matt