Fixes pubsub issues