Fix synchronization issues in policy-api