2.2 fixes and new boosts