Fixing iOS issues