Fixed issues raised during gk operations
Merge pull request #726 from lingalamadhukar/gk_issues

Fixed issues raised during gk operations