Couple of small tweaks.
Merge pull request #5361 from Zuhayr/master

Couple of small tweaks.