Updates made to build with 4.2.2 frameworks