Debian/Travis fixes