Fixing minor policy issues