Fixed some issues with String class changes