1) Correction of the defects reported in defect report 338 2) Correction of the defects reported in defect report 339