more machine fixes

fixed in the mail system PR