Tweaks to upgrade to 2.11.2