Last changes for working debian sid