Tweaks to handsaking