various changes to fix on Debian Sid