Defect fixes

2572, 2713