Fixed pub/sub bugs.
Fixed exclusion bugs in pub/sub