Tags and hashes fixes