And fix the busted hash keys.