Fixes in policy persistence (against branch feature/policy-persistence)