More Spam Rule Fixes