Further fixes to the release.
Final fixes to Release 0.2.2