Hunter fixes