Initial Commit  Fixes for iOS 8