A few build fixes for Android and iOS