Address 2.2 issues