Various changes to support new FaxHandler