Some more SCC fixes