diff --git a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
index b78b295d02..598deeb16b 100644
--- a/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
+++ b/extras/Introjucer/Source/Application/jucer_CommandLine.cpp
@@ -208,24 +208,6 @@ namespace
         return 0;
     }
 
-    int listModules()
-    {
-        hideDockIcon();
-
-        std::cout << "Downloading list of available modules..." << std::endl;
-        AvailableModuleList list;
-        list.loadFromWebsite();
-
-        for (int i = 0; i < list.modules.size(); ++i)
-        {
-            const AvailableModuleList::Module* m = list.modules.getUnchecked(i);
-
-            std::cout << m->uid << ": " << m->version << std::endl;
-        }
-
-        return 0;
-    }
-
     int showStatus (const StringArray& args)
     {
         hideDockIcon();
@@ -284,9 +266,6 @@ namespace
                   << " introjucer --resave-resources project_file" << std::endl
                   << "    Resaves just the binary resources for a project." << std::endl
                   << std::endl
-                  << " introjucer --listmodules" << std::endl
-                  << "    Displays a list of modules available from the website." << std::endl
-                  << std::endl
                   << " introjucer --status project_file" << std::endl
                   << "    Displays information about a project." << std::endl
                   << std::endl
@@ -313,7 +292,6 @@ int performCommandLine (const String& commandLine)
     if (matchArgument (args[0], "resave-resources"))    return resaveProject (args, true);
     if (matchArgument (args[0], "buildmodule"))         return buildModules (args, false);
     if (matchArgument (args[0], "buildallmodules"))     return buildModules (args, true);
-    if (matchArgument (args[0], "listmodules"))         return listModules();
     if (matchArgument (args[0], "status"))              return showStatus (args);
 
     return commandLineNotPerformed;
diff --git a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
index 49c611f75a..ba43e6e3cc 100644
--- a/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
+++ b/extras/Introjucer/Source/Utility/jucer_PresetIDs.h
@@ -33,6 +33,7 @@ namespace Ids
 
     DECLARE_ID (name);
     DECLARE_ID (file);
+    DECLARE_ID (path);
     DECLARE_ID (text);
     DECLARE_ID (version);
     DECLARE_ID (companyName);
@@ -42,7 +43,6 @@ namespace Ids
     DECLARE_ID (height);
     DECLARE_ID (background);
     DECLARE_ID (initialState);
-    DECLARE_ID (juceFolder);
     DECLARE_ID (targetFolder);
     DECLARE_ID (intermediatesPath);
     DECLARE_ID (vstFolder);
@@ -136,6 +136,19 @@ namespace Ids
     DECLARE_ID (maxBinaryFileSize);
     DECLARE_ID (includeBinaryInAppConfig);
     DECLARE_ID (characterSet);
+    DECLARE_ID (JUCERPROJECT);
+    DECLARE_ID (MAINGROUP);
+    DECLARE_ID (EXPORTFORMATS);
+    DECLARE_ID (GROUP);
+    DECLARE_ID (FILE);
+    DECLARE_ID (MODULES);
+    DECLARE_ID (MODULE);
+    DECLARE_ID (JUCEOPTIONS);
+    DECLARE_ID (CONFIGURATIONS);
+    DECLARE_ID (CONFIGURATION);
+    DECLARE_ID (MODULEPATHS);
+    DECLARE_ID (MODULEPATH);
+
     const Identifier ID ("id");
     const Identifier class_ ("class");
 
diff --git a/modules/juce_core/maths/juce_Random.cpp b/modules/juce_core/maths/juce_Random.cpp
index 3b796730ad..a055750cc8 100644
--- a/modules/juce_core/maths/juce_Random.cpp
+++ b/modules/juce_core/maths/juce_Random.cpp
@@ -93,12 +93,12 @@ bool Random::nextBool() noexcept
 
 float Random::nextFloat() noexcept
 {
-    return static_cast <uint32> (nextInt()) / (float) 0xffffffff;
+    return static_cast<uint32> (nextInt()) / (std::numeric_limits<uint32>::max() + 1.0f);
 }
 
 double Random::nextDouble() noexcept
 {
-    return static_cast <uint32> (nextInt()) / (double) 0xffffffff;
+    return static_cast<uint32> (nextInt()) / (std::numeric_limits<uint32>::max() + 1.0);
 }
 
 BigInteger Random::nextLargeNumber (const BigInteger& maximumValue)