SS fixes