iOS7 fixes and observe cleanup