Small changes to build 2.2 distribution