Fixed minor bugs identified by GDIT Gap analysis team phone call.
Merge branch 'my'