Improved Debian/Ubunutu support