Fixes for text layout.