Further tweak for 2.2.1 release