Fixing the EOP metadata generation.