Merge pull request #4985 from nabinhait/minor_fixes

minot fixes