Fixed spammer abuse mechanism + minor optimizations.