Functional fixes for Policies