Merge pull request #2410 from nabinhait/fix1

Minor fixes