Various enhancements, mostly Debian oriented

Should we also use ```6.```?