Modules: Debian Changes +

Make appropiate changes for Debian 9.0 compatibility +
other features