Add some debug logging around sending heartbeats
Work around an iOS 8 bug when tapping the + button