Fix #1773 and #1778 by tweaking text

Fixes #1773 
Fixes #1778