Fix breakage due to hashing changes