Complete fixes for NCT6791D