Bug fixes to Policy editor