Remove warnings in policy-api code