Updates to fix build for iOS