Bug-3425 : Cont. minor changes to incorporate the code review from Sam