HAMMER: Fix a couple of minor non-corrupting bugs in HAMMER.