More hunter changes