Merge pull request #6280 from nabinhait/minorfixes

Minor fixes