Updates for iOS Compatibility