Both should have been fixed as part of the settlement agreement. Your invoice date of August of this year confirms it. There was an extended new car warranty in place from February to Nov of this year. I would raise holy hell with VW’s customer line, demanding a reimbursement ,and if that fails, contact the settlement attorneys. Now that a fix has been announced these items are still covered as part of the settlement warranty on emissions and engine components.