Bug fixes for policy editor