Policy client fixes