Fixed references to cfengine variables