More attempts to fix various debian builds.