SCP - policy client formatting tweaks