Various changes to support the enhanced FaxHandler