Everything except the test compiles now against EDS 3.8