Merge pull request #2072 from nabinhait/hotfix

Multiple small fixes