Fix for iOS
Minor improvements