iOS 8 fixes

Signed-off-by: Russell Stephens <russell.stephens@continentaltide.com>