More Spam Fixes