Fixes for 2.11 merge from 12