Fixing some text issues