more fixes for aosp