Fixing policy build issues