Fixes for Debian sid