fixed some policy issues