commands/unsubscribe fixes