diff --git a/Classes/BITCrashManager.m b/Classes/BITCrashManager.m
index 8ade9ec43d..136904802d 100644
--- a/Classes/BITCrashManager.m
+++ b/Classes/BITCrashManager.m
@@ -108,7 +108,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
     
     NSString *testValue = [[NSUserDefaults standardUserDefaults] stringForKey:kBITCrashManagerStatus];
     if (testValue) {
-      _crashManagerStatus = [[NSUserDefaults standardUserDefaults] integerForKey:kBITCrashManagerStatus];
+      _crashManagerStatus = (BITCrashManagerStatus) [[NSUserDefaults standardUserDefaults] integerForKey:kBITCrashManagerStatus];
     } else {
       // migrate previous setting if available
       if ([[NSUserDefaults standardUserDefaults] boolForKey:@"BITCrashAutomaticallySendReports"]) {
@@ -198,7 +198,7 @@ NSString *const kBITCrashManagerStatus = @"BITCrashManagerStatus";
     if ([rootObj objectForKey:kBITCrashApprovedReports])
       [_approvedCrashReports setDictionary:[rootObj objectForKey:kBITCrashApprovedReports]];
   } else {
-    BITHockeyLog(@"ERROR: Reading settings. %@", errorString);
+    BITHockeyLog(@"ERROR: Reading crash manager settings.");
   }
 }
 
diff --git a/Classes/BITCrashReportTextFormatter.m b/Classes/BITCrashReportTextFormatter.m
index be8f5b9182..e21477529f 100644
--- a/Classes/BITCrashReportTextFormatter.m
+++ b/Classes/BITCrashReportTextFormatter.m
@@ -602,7 +602,7 @@ static NSInteger binaryImageSort(id binary1, id binary2, void *context) {
             index += range.length - 1;
         }
         if (index > 32) {
-            imageName = [NSString stringWithFormat:@"%@...", [imageName substringToIndex:index - 1]];
+            imageName = [NSString stringWithFormat:@"%@... ", [imageName substringToIndex:index - 1]];
             index += 3;
             break;
         }
diff --git a/Classes/BITFeedbackMessage.m b/Classes/BITFeedbackMessage.m
index 21f7b406b0..aeb595abdb 100644
--- a/Classes/BITFeedbackMessage.m
+++ b/Classes/BITFeedbackMessage.m
@@ -72,7 +72,7 @@
     self.email = [decoder decodeObjectForKey:@"email"];
     self.date = [decoder decodeObjectForKey:@"date"];
     self.id = [decoder decodeObjectForKey:@"id"];
-    self.status = [decoder decodeIntegerForKey:@"status"];
+    self.status = (BITFeedbackMessageStatus)[decoder decodeIntegerForKey:@"status"];
     self.userMessage = [decoder decodeBoolForKey:@"userMessage"];
     self.token = [decoder decodeObjectForKey:@"token"];
   }
diff --git a/Classes/BITHockeyHelper.m b/Classes/BITHockeyHelper.m
index 3f3db5ed49..0eb522c542 100644
--- a/Classes/BITHockeyHelper.m
+++ b/Classes/BITHockeyHelper.m
@@ -306,7 +306,7 @@ UIImage *bit_imageToFitSize(UIImage *inputImage, CGSize fitSize, BOOL honorScale
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
     CGContextRef context = CGBitmapContextCreate(NULL,  scaledWidth, scaledHeight, 8, (fitSize.width * 4),
                                                  colorSpace, kCGImageAlphaPremultipliedLast);
-    CGImageRef sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect);
+    sourceImg = CGImageCreateWithImageInRect([inputImage CGImage], sourceRect);
     CGContextDrawImage(context, destRect, sourceImg);
     CGImageRelease(sourceImg);
     CGImageRef finalImage = CGBitmapContextCreateImage(context);
@@ -409,13 +409,13 @@ UIImage *bit_roundedCornerImage(UIImage *inputImage, NSInteger cornerSize, NSInt
     UIImage *image = bit_imageWithAlpha(inputImage);
     
     // Build a context that's the same dimensions as the new size
-    CGContextRef context = CGBitmapContextCreate(NULL,
-                                                 image.size.width,
-                                                 image.size.height,
-                                                 CGImageGetBitsPerComponent(image.CGImage),
-                                                 0,
-                                                 CGImageGetColorSpace(image.CGImage),
-                                                 CGImageGetBitmapInfo(image.CGImage));
+    context = CGBitmapContextCreate(NULL,
+                                    image.size.width,
+                                    image.size.height,
+                                    CGImageGetBitsPerComponent(image.CGImage),
+                                    0,
+                                    CGImageGetColorSpace(image.CGImage),
+                                    CGImageGetBitmapInfo(image.CGImage));
     
     // Create a clipping path with rounded corners
     CGContextBeginPath(context);