More Prep for Spamassassin and 3.0.0.7