Various changes on the way to the new FaxHandler