Minor policy framework changes and better logging