More changes for the wheezy upgrade