Fix SSP support