ios build fixes wip