Merge pull request #3337 from nabinhait/fix1

Multiple fixes