Better handling of abbreviated hashes