case 3616 - Another set of CR fixes.