Text-related bug-fixes.