misc fixes to spam, etc.