a few more defect fixes