diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index 4efe139525..81de548f2a 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -70235,7 +70235,7 @@ public:
 		if (forcedUpdate || cursor.getHandle() != currentCursorHandle)
 		{
 			currentCursorHandle = cursor.getHandle();
-			cursor.showInWindow (lastPeer);
+			cursor.showInWindow (getPeer());
 		}
 	}
 
@@ -230591,7 +230591,7 @@ public:
 		}
 
 		StringArray fontDirs;
-		fontDirs.addTokens (String (getenv ("JUCE_FONT_PATH")), T(";,"), 0);
+		fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty);
 		fontDirs.removeEmptyStrings (true);
 
 		if (fontDirs.size() == 0)
@@ -231006,7 +231006,7 @@ static const String pickBestFont (const StringArray& names,
 								  const char* const choicesString)
 {
 	StringArray choices;
-	choices.addTokens (String (choicesString), T(","), 0);
+	choices.addTokens (String (choicesString), ",", String::empty);
 	choices.trim();
 	choices.removeEmptyStrings();
 
@@ -236584,11 +236584,11 @@ void FileChooser::showPlatformDialog (Array<File>& results,
 
 	if (status == 0)
 	{
-		String resultString (String::fromUTF8 ((const char*) result.getData(), result.getDataSize()));
+		String resultString (String::fromUTF8 (result.getData(), result.getDataSize()));
 		StringArray tokens;
 
 		if (selectMultipleFiles)
-			tokens.addTokens (resultString, separator, 0);
+			tokens.addTokens (resultString, separator, String::empty);
 		else
 			tokens.add (resultString);
 
diff --git a/src/gui/components/mouse/juce_MouseInputSource.cpp b/src/gui/components/mouse/juce_MouseInputSource.cpp
index cfed9eb1bf..f919643c38 100644
--- a/src/gui/components/mouse/juce_MouseInputSource.cpp
+++ b/src/gui/components/mouse/juce_MouseInputSource.cpp
@@ -416,7 +416,7 @@ public:
         if (forcedUpdate || cursor.getHandle() != currentCursorHandle)
         {
             currentCursorHandle = cursor.getHandle();
-            cursor.showInWindow (lastPeer);
+            cursor.showInWindow (getPeer());
         }
     }
 
diff --git a/src/native/linux/juce_linux_FileChooser.cpp b/src/native/linux/juce_linux_FileChooser.cpp
index 41b2a42d09..e31bd6aed3 100644
--- a/src/native/linux/juce_linux_FileChooser.cpp
+++ b/src/native/linux/juce_linux_FileChooser.cpp
@@ -81,11 +81,11 @@ void FileChooser::showPlatformDialog (Array<File>& results,
 
     if (status == 0)
     {
-        String resultString (String::fromUTF8 ((const char*) result.getData(), result.getDataSize()));
+        String resultString (String::fromUTF8 (result.getData(), result.getDataSize()));
         StringArray tokens;
 
         if (selectMultipleFiles)
-            tokens.addTokens (resultString, separator, 0);
+            tokens.addTokens (resultString, separator, String::empty);
         else
             tokens.add (resultString);
 
diff --git a/src/native/linux/juce_linux_Fonts.cpp b/src/native/linux/juce_linux_Fonts.cpp
index 0691d4bfb1..d4c2f8a7c1 100644
--- a/src/native/linux/juce_linux_Fonts.cpp
+++ b/src/native/linux/juce_linux_Fonts.cpp
@@ -101,7 +101,7 @@ public:
         }
 
         StringArray fontDirs;
-        fontDirs.addTokens (String (getenv ("JUCE_FONT_PATH")), T(";,"), 0);
+        fontDirs.addTokens (String::fromUTF8 (getenv ("JUCE_FONT_PATH")), ";,", String::empty);
         fontDirs.removeEmptyStrings (true);
 
         if (fontDirs.size() == 0)
@@ -521,7 +521,7 @@ static const String pickBestFont (const StringArray& names,
                                   const char* const choicesString)
 {
     StringArray choices;
-    choices.addTokens (String (choicesString), T(","), 0);
+    choices.addTokens (String (choicesString), ",", String::empty);
     choices.trim();
     choices.removeEmptyStrings();