Fixes for 1.22 release.