SCP - Policy client tweaks