More hitfinder8 tweaks
Merge branch 'testing'