More changes to make plugman compatible