Aside from fixing that SafeObservableSubscription doesn't exist anymore