Some tweaks to FAX processing