Defect fixes