Fixed the Policy API issues and Bugfixes

No match.