2.11.0-M3: make it compile and fix a test