Fix issues after modifying pub/sub part