More iOS8 fixes