iOS 8 bug fixes

Snuck in some iOS 8 bug fixes that I discovered while doing some testing :)