* Fix policy flow bugs around permissions and roles.
