Android and iOS build fixes