minor fixes
Merge pull request #2150 from nabinhait/hotfix

minor fixes