Fix issues in iOS