Fixes for texts