A few cleanup changes, updating various bits to v2.2 in preparation of release.