More fixes (v2.2)