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