Autosubscribe tweaks