SSP small changes