Merge pull request #2673 from nabinhait/fix1

Multiple fixes