Fixed policy flavors, and excessive debug text