Minor fixes
Merge pull request #589 from anandpdoshi/hotfix

Minor fixes