Fixes to text end tweaking