Various changes
More generic detection of package managers