Fix synchronization issues in policy-api

No match.