Minor tweaks to sub/unsub logic