Fixes for Text