Fixes for subscribeOnce + unsubscribe