More AOSP compatibility fixes