Fix policies and policy specs