Minor fixes
Merge pull request #438 from ankit-maverick/minor_fixes

Minor fixes