Fix minor issues in policy interface