Initial iOS 8 support.

- Some minor changes