Fixup policies to use attribute references