Fixes to new hitfinder operation