Fix of compilation issues related to introduction of hash indexes.