Doing small updates to fix who does hwat