Fix hunt problems