Adding changes for new Debian base