Add in @infograf768 corrections for hathor