Fixes for Texts