Fixing texts from pull requests #840 and #841

Fixing texts from pull requests #840 and #841