Bug fixes for tracker in iOS 8.