diff --git a/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h
index f6675e5deb..46388b20ed 100644
--- a/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h
+++ b/extras/Introjucer/Source/Utility/jucer_JucerTreeViewBase.h
@@ -63,11 +63,11 @@ public:
     virtual void deleteItem();
     virtual void deleteAllSelectedItems();
     virtual void showDocument();
-    virtual void showPopupMenu();
     virtual void showMultiSelectionPopupMenu();
     virtual void showRenameBox();
 
     void launchPopupMenu (PopupMenu&); // runs asynchronously, and produces a callback to handlePopupMenuResult().
+    virtual void showPopupMenu();
     virtual void handlePopupMenuResult (int resultCode);
 
     //==============================================================================
diff --git a/extras/audio plugin demo/Source/PluginEditor.cpp b/extras/audio plugin demo/Source/PluginEditor.cpp
index 32a0477d4e..b36d550806 100644
--- a/extras/audio plugin demo/Source/PluginEditor.cpp	
+++ b/extras/audio plugin demo/Source/PluginEditor.cpp	
@@ -122,17 +122,15 @@ static const String timeToTimecodeString (const double seconds)
 {
     const double absSecs = fabs (seconds);
 
-    const int hours = (int) (absSecs / (60.0 * 60.0));
+    const int hours =  (int) (absSecs / (60.0 * 60.0));
     const int mins  = ((int) (absSecs / 60.0)) % 60;
     const int secs  = ((int) absSecs) % 60;
 
-    String s;
-    if (seconds < 0)
-        s = "-";
+    String s (seconds < 0 ? "-" : "");
 
     s << String (hours).paddedLeft ('0', 2) << ":"
-      << String (mins).paddedLeft ('0', 2) << ":"
-      << String (secs).paddedLeft ('0', 2) << ":"
+      << String (mins) .paddedLeft ('0', 2) << ":"
+      << String (secs) .paddedLeft ('0', 2) << ":"
       << String (roundToInt (absSecs * 1000) % 1000).paddedLeft ('0', 3);
 
     return s;
@@ -149,7 +147,7 @@ static const String ppqToBarsBeatsString (double ppq, double /*lastBarPPQ*/, int
 
     const int bar    = ((int) ppq) / ppqPerBar + 1;
     const int beat   = ((int) beats) + 1;
-    const int ticks  = ((int) (fmod (beats, 1.0) * 960.0));
+    const int ticks  = ((int) (fmod (beats, 1.0) * 960.0 + 0.5));
 
     String s;
     s << bar << '|' << beat << '|' << ticks;
diff --git a/modules/juce_graphics/image_formats/pnglib/pngerror.c b/modules/juce_graphics/image_formats/pnglib/pngerror.c
index 782a6f70bb..e109bd843b 100644
--- a/modules/juce_graphics/image_formats/pnglib/pngerror.c
+++ b/modules/juce_graphics/image_formats/pnglib/pngerror.c
@@ -83,11 +83,11 @@ void PNGAPI
 png_err(png_structp png_ptr)
 {
    if (png_ptr != NULL && png_ptr->error_fn != NULL)
-      (*(png_ptr->error_fn))(png_ptr, '\0');
+      (*(png_ptr->error_fn))(png_ptr, 0);
 
    /* If the custom handler doesn't exist, or if it returns,
       use the default handler, which will not return. */
-   png_default_error(png_ptr, '\0');
+   png_default_error(png_ptr, 0);
 }
 #endif /* PNG_NO_ERROR_TEXT */
 
diff --git a/modules/juce_graphics/image_formats/pnglib/pngwutil.c b/modules/juce_graphics/image_formats/pnglib/pngwutil.c
index 352035d47b..f6ad8782b4 100644
--- a/modules/juce_graphics/image_formats/pnglib/pngwutil.c
+++ b/modules/juce_graphics/image_formats/pnglib/pngwutil.c
@@ -1313,7 +1313,7 @@ png_check_keyword(png_structp png_ptr, png_charp key, png_charpp new_key)
    if (key_len > 79)
    {
       png_warning(png_ptr, "keyword length must be 1 - 79 characters");
-      new_key[79] = '\0';
+      (*new_key)[79] = '\0';
       key_len = 79;
    }