Fixed warnings from iOS7 & 8