Various changes to policy server and setup info