Fix warnings on Mac
Version bump: 2.2.0