fix device mapper issues

To make 6.6 fully working and allow us to upload it I'm adding these patches of the v2 to fix it. v2 pretty much looks final and might be applied as-is later on, but since I had it working for tests already I thought I can provide you with that.

We considered an upload to experimental before, with this applied it might even make sense to upload to unstable.