more fixes for SSP convert