More iOS fixes