fixing defects D3459 and two other suggestions