Updates re. hermes @ 51a0a62