More modifications for SDK 21 build