diff --git a/Marshmallows/MMHTTPClient.m b/Marshmallows/MMHTTPClient.m
index 0685718..3064ba7 100644
--- a/Marshmallows/MMHTTPClient.m
+++ b/Marshmallows/MMHTTPClient.m
@@ -280,7 +280,7 @@ NSString *JoinURLComponents(NSString *first, va_list args)
     }
     NSUInteger timeout = [[options objectForKey: @"timeout"] unsignedIntValue];
     if (timeout == 0) {
-        [mutableOptions setValue: [NSNumber numberWithUnsignedInt: self.timeout] forKey: @"timeout"];
+        [mutableOptions setValue: [NSNumber numberWithUnsignedLong: self.timeout] forKey: @"timeout"];
     }
     options = [NSDictionary dictionaryWithDictionary: mutableOptions];
     return [MMHTTPRequest requestWithOptions: options callback: callback];
diff --git a/Marshmallows/UIAlertViewDelegate.h b/Marshmallows/UIAlertViewDelegate.h
index 655bccd..3df186f 100644
--- a/Marshmallows/UIAlertViewDelegate.h
+++ b/Marshmallows/UIAlertViewDelegate.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-typedef void (^UIAlertViewCallback)(int buttonClicked, BOOL canceled);
+typedef void (^UIAlertViewCallback)(long buttonClicked, BOOL canceled);
 
 @interface UIAlertViewDelegate : NSObject <UIAlertViewDelegate>
 {