Minor changes in hammer2 utility.