Fix some small issues and some strings