Hotfixes for my queue changes that won't explode if you delete datasets ...

...anymore