Fixes for Ubuntu/Debian.