Tweaks for v2.2.2