SC fix and services fix