More cspam bugs fixed.