Tweaks for 2.2.x installation.