Defect fixes..