fixes for SSC