Debian compatibility improvements