More bugfixes for unsub