Fix force close (2/2) / change some strings