Minor defect fixes.