Solving various hunt outstanding issues