Fixes for 1.11.x