few defect fixes

2278
2275
2281