Fixes #3741, 3629 - hammer usability improvements