SS fixes, cleanup