Improvements for Debian compatibilities