Fixing up policy server some more.