fixes as per Bug 6903

git-svn-id: https://svn.apache.org/repos/asf/spamassassin/trunk@1448183 13f79535-47bb-0310-9956-ffa450edef68