mandrill client fixes