Some changes needed by postfix plugin