Bugfixes related to new ADT and newer Cuckoo version