Fix PubNub Issues