mailers and production fixes