Fix incompatibilites between node expansion and policyfile