Various fixes for using cfacter under Puppet.