Spanclass fixes
fix2
fix3
Merge pull request #4685 from Firecage/Spanclassstuff

Spanclass fixes