iOS Fixes