Fix some potential warnings
Version bump: 2.2.1