Updates to support building on 4.2