Minor changes required for 2.11 compilation