Fixes for hashing changes (JuliaLang/julia#6624)