Fixes to the text drawing