Minor fixes on HR-293
Improvisation
Merge pull request #479 from monishdeb/HR-293

Minor fixes on HR-293