mailing fixes