Minor defect fixes