More changes to run it on debian