Further Debian split fixes.