Backport some EURid-fixes from the upstream