Bug fixes to Policy Editor