Changes made to allow building in 4.4