Added some fixes for strings after testing.