Merge pull request #2339 from nabinhait/fix1

Minor fixes