Fixes for SCC
Peculiar fixes for SCC