diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp
index a6ea71faaa..b7341fff0b 100644
--- a/juce_amalgamated.cpp
+++ b/juce_amalgamated.cpp
@@ -270110,7 +270110,7 @@ END_JUCE_NAMESPACE
 - (NSRange) markedRange;
 - (NSRange) selectedRange;
 - (NSRect) firstRectForCharacterRange: (NSRange) theRange;
-- (unsigned int) characterIndexForPoint: (NSPoint) thePoint;
+- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint;
 - (NSArray*) validAttributesForMarkedText;
 
 - (void) flagsChanged: (NSEvent*) ev;
@@ -270486,13 +270486,15 @@ END_JUCE_NAMESPACE
 - (void) insertText: (id) aString
 {
 	// This commits multi-byte text when return is pressed, or after every keypress for western keyboards
-	if ([aString length] > 0)
+	NSString* newText = [aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString;
+
+	if ([newText length] > 0)
 	{
 		TextInputTarget* const target = owner->findCurrentTextInputTarget();
 
 		if (target != 0)
 		{
-			target->insertTextAtCaret (nsStringToJuce ([aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString));
+			target->insertTextAtCaret (nsStringToJuce (newText));
 			textWasInserted = true;
 		}
 	}
@@ -270603,7 +270605,7 @@ END_JUCE_NAMESPACE
 					   bounds.getHeight());
 }
 
-- (unsigned int) characterIndexForPoint: (NSPoint) thePoint
+- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint
 {
 	(void) thePoint;
 	return NSNotFound;
@@ -271438,6 +271440,9 @@ void NSViewComponentPeer::redirectMouseWheel (NSEvent* ev)
 		y = [ev deviceDeltaY] * 0.5f;
 	}
 	@catch (...)
+	{}
+
+	if (x == 0 && y == 0)
 	{
 		x = [ev deltaX] * 10.0f;
 		y = [ev deltaY] * 10.0f;
diff --git a/juce_amalgamated.h b/juce_amalgamated.h
index d32efe2371..7126e602fb 100644
--- a/juce_amalgamated.h
+++ b/juce_amalgamated.h
@@ -64,7 +64,7 @@
 */
 #define JUCE_MAJOR_VERSION	  1
 #define JUCE_MINOR_VERSION	  52
-#define JUCE_BUILDNUMBER	38
+#define JUCE_BUILDNUMBER	39
 
 /** Current Juce version number.
 
diff --git a/src/core/juce_StandardHeader.h b/src/core/juce_StandardHeader.h
index 00df35f868..5ff919c344 100644
--- a/src/core/juce_StandardHeader.h
+++ b/src/core/juce_StandardHeader.h
@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      1
 #define JUCE_MINOR_VERSION      52
-#define JUCE_BUILDNUMBER        38
+#define JUCE_BUILDNUMBER        39
 
 /** Current Juce version number.
 
diff --git a/src/native/mac/juce_mac_NSViewComponentPeer.mm b/src/native/mac/juce_mac_NSViewComponentPeer.mm
index 01cea59f1b..0b1d1afaad 100644
--- a/src/native/mac/juce_mac_NSViewComponentPeer.mm
+++ b/src/native/mac/juce_mac_NSViewComponentPeer.mm
@@ -87,7 +87,7 @@ END_JUCE_NAMESPACE
 - (NSRange) markedRange;
 - (NSRange) selectedRange;
 - (NSRect) firstRectForCharacterRange: (NSRange) theRange;
-- (unsigned int) characterIndexForPoint: (NSPoint) thePoint;
+- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint;
 - (NSArray*) validAttributesForMarkedText;
 
 - (void) flagsChanged: (NSEvent*) ev;
@@ -474,13 +474,15 @@ END_JUCE_NAMESPACE
 - (void) insertText: (id) aString
 {
     // This commits multi-byte text when return is pressed, or after every keypress for western keyboards
-    if ([aString length] > 0)
+    NSString* newText = [aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString;
+
+    if ([newText length] > 0)
     {
         TextInputTarget* const target = owner->findCurrentTextInputTarget();
 
         if (target != 0)
         {
-            target->insertTextAtCaret (nsStringToJuce ([aString isKindOfClass: [NSAttributedString class]] ? [aString string] : aString));
+            target->insertTextAtCaret (nsStringToJuce (newText));
             textWasInserted = true;
         }
     }
@@ -591,7 +593,7 @@ END_JUCE_NAMESPACE
                        bounds.getHeight());
 }
 
-- (unsigned int) characterIndexForPoint: (NSPoint) thePoint
+- (NSUInteger) characterIndexForPoint: (NSPoint) thePoint
 {
     (void) thePoint;
     return NSNotFound;
@@ -1437,6 +1439,9 @@ void NSViewComponentPeer::redirectMouseWheel (NSEvent* ev)
         y = [ev deviceDeltaY] * 0.5f;
     }
     @catch (...)
+    {}
+
+    if (x == 0 && y == 0)
     {
         x = [ev deltaX] * 10.0f;
         y = [ev deltaY] * 10.0f;