Updates to fix build breaks on 2.2