diff --git a/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/adpcm_data.h b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/adpcm_data.h
index a14d52088..1e32436fc 100644
--- a/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/adpcm_data.h
+++ b/Frameworks/FFMPEG/ffmpeg-minimal/libavcodec/adpcm_data.h
@@ -31,7 +31,7 @@
 static const uint8_t ff_adpcm_ima_block_sizes[4]   = {  4, 12, 4, 20 };
 static const uint8_t ff_adpcm_ima_block_samples[4] = { 16, 32, 8, 32 };
 
-extern const int8_t const *ff_adpcm_index_tables[4];
+extern const int8_t *ff_adpcm_index_tables[4];
 extern const int8_t  ff_adpcm_index_table[16];
 extern const int16_t ff_adpcm_step_table[89];
 extern const int16_t ff_adpcm_oki_step_table[49];
diff --git a/Frameworks/NDHotKey/NDHotKey/NDHotKeyControl.m b/Frameworks/NDHotKey/NDHotKey/NDHotKeyControl.m
index f5c780f4f..938794003 100644
--- a/Frameworks/NDHotKey/NDHotKey/NDHotKeyControl.m
+++ b/Frameworks/NDHotKey/NDHotKey/NDHotKeyControl.m
@@ -113,7 +113,7 @@
 		keyCode = [anEvent keyCode];
 		modifierFlags = theModifierFlags;
 
-		[self setStringValue:[theKeyboardLayout stringForKeyCode:keyCode modifierFlags:modifierFlags]];
+		[self setStringValue:[theKeyboardLayout stringForKeyCode:keyCode modifierFlags:(UInt32)modifierFlags]];
 		[self performClick:self];
 		if( ![self stayReadyForEvent] )
 			[self setReadyForHotKeyEvent:NO];
diff --git a/Frameworks/NDHotKey/NDHotKey/NDHotKeyEvent.m b/Frameworks/NDHotKey/NDHotKey/NDHotKeyEvent.m
index 79f701f16..6e2761831 100644
--- a/Frameworks/NDHotKey/NDHotKey/NDHotKeyEvent.m
+++ b/Frameworks/NDHotKey/NDHotKey/NDHotKeyEvent.m
@@ -87,7 +87,7 @@ static BOOL isEqualHashFunction( NSHashTable * aTable, const void * aFirstHotKey
 static NSString * describeHashFunction( NSHashTable * aTable, const void * aHotKeyEvent );
 #endif
 
-static UInt32 _idForCharacterAndModifer( unichar aCharacter, NSUInteger aModFlags ) { return (NSUInteger)aCharacter | (aModFlags<<16); }
+static UInt32 _idForCharacterAndModifer( unichar aCharacter, NSUInteger aModFlags ) { return (UInt32)aCharacter | (UInt32)(aModFlags<<16); }
 
 static void _getCharacterAndModiferForId( UInt32 anId, unichar *aCharacter, NSUInteger *aModFlags )
 {
@@ -465,7 +465,7 @@ struct HotKeyMappingEntry
 {
 	return [NSDictionary dictionaryWithObjectsAndKeys:
 		[NSNumber numberWithUnsignedShort:[self keyCode]], kArchivingKeyCodeKey,
-		[NSNumber numberWithUnsignedInt:[self modifierFlags]], kArchivingModifierFlagsKey,
+		[NSNumber numberWithUnsignedLong:[self modifierFlags]], kArchivingModifierFlagsKey,
 		NSStringFromSelector( selectorPressed ), kArchivingSelectorPressedCodeKey,
 		NSStringFromSelector( selectorReleased ), kArchivingSelectorReleasedCodeKey,
 		nil];
@@ -654,7 +654,7 @@ struct HotKeyMappingEntry
 - (UInt16)keyCode { return [[NDKeyboardLayout keyboardLayout] keyCodeForCharacter:self.keyCharacter numericPad:self.keyPad]; }
 - (NSUInteger)modifierFlags { return modifierFlags; }
 - (UInt32)hotKeyId { return _idForCharacterAndModifer( self.keyCharacter, self.modifierFlags ); }
-- (NSString *)stringValue { return [[NDKeyboardLayout keyboardLayout] stringForKeyCode:[self keyCode] modifierFlags:[self modifierFlags]]; }
+- (NSString *)stringValue { return [[NDKeyboardLayout keyboardLayout] stringForKeyCode:[self keyCode] modifierFlags:(UInt32)[self modifierFlags]]; }
 
 - (BOOL)isEqual:(id)anObject
 {
@@ -870,7 +870,7 @@ static OSStatus switchHotKey( NDHotKeyEvent * self, BOOL aFlag )
 			NSCAssert( theHotKeyID.signature, @"HotKeyEvent signature has not been set yet" );
 			NSCParameterAssert(sizeof(unsigned long) >= sizeof(id) );
 
-			theError = RegisterEventHotKey( self.keyCode, NDCarbonModifierFlagsForCocoaModifierFlags(self->modifierFlags), theHotKeyID, GetEventDispatcherTarget(), 0, &self->reference );
+			theError = RegisterEventHotKey( self.keyCode, (UInt32)NDCarbonModifierFlagsForCocoaModifierFlags(self->modifierFlags), theHotKeyID, GetEventDispatcherTarget(), 0, &self->reference );
 		}
 	}
 	else
diff --git a/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m b/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
index ee46ec8a6..6ef63eda3 100644
--- a/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
+++ b/Frameworks/NDHotKey/NDHotKey/NDKeyboardLayout.m
@@ -315,7 +315,7 @@ NSUInteger NDCarbonModifierFlagsForCocoaModifierFlags( NSUInteger aModifierFlags
 
 static volatile NDKeyboardLayout		* kCurrentKeyboardLayout = nil;
 
-void NDKeyboardLayoutNotificationCallback( CFNotificationCenterRef aCenter, void * self, CFStringRef aName, const void * anObj, CFDictionaryRef aUserInfo )
+static void NDKeyboardLayoutNotificationCallback( CFNotificationCenterRef aCenter, void * self, CFStringRef aName, const void * anObj, CFDictionaryRef aUserInfo )
 {
 	NSDictionary		* theUserInfo = [NSDictionary dictionaryWithObject:kCurrentKeyboardLayout forKey:NDKeyboardLayoutPreviousKeyboardLayoutUserInfoKey];
 	@synchronized(self) { [kCurrentKeyboardLayout release], kCurrentKeyboardLayout = nil; }
@@ -421,7 +421,7 @@ void NDKeyboardLayoutNotificationCallback( CFNotificationCenterRef aCenter, void
 
 		if( UCKeyTranslate( self.keyboardLayoutPtr, aKeyCode,
 							 kUCKeyActionDisplay,
-							 NDCarbonModifierFlagsForCocoaModifierFlags(aModifierFlags),
+							 (UInt32)NDCarbonModifierFlagsForCocoaModifierFlags(aModifierFlags),
 							 LMGetKbdType(),
 							 kUCKeyTranslateNoDeadKeysBit,
 							 &theDeadKeyState,