2.2.0A Tweaks and fixes