Fix hhmv build