various changes to fix packages on Debian Sid