Some string and other fixes