Migrate some EAD fixes from ICA-Atom upstream