Merge pull request #731 from vandalon/Pistachitos

Some more SCC fixes.