Apply some EO WG feedback