Make buildable under 2.11