fixed some hunt-client related problems