Bug fixes to policy editor