Fixed text issues