Debian exp bring back sid fixes

This brings back a few of the changes made to sid packaging that I noticed were missing in experimental. I mostly cherry picked from sid, except when a straight copy made more sense.