defect fixes