fixes for AOSP