More fixes.
Release v0.2.2