Include minor fixes.
Merge pull request #4241 from HassenRiahi/include-minor-fixes

Include minor fixes.