A few tweaks to be more flexible with other packages. Cfengine build is now correct.