Build fixes for Debian unstable