Minor policy interceptor and governance changes