fixes for defect.