diff --git a/Additions/NSObject+STAdditions.m b/Additions/NSObject+STAdditions.m
index 1495601..47efeb6 100644
--- a/Additions/NSObject+STAdditions.m
+++ b/Additions/NSObject+STAdditions.m
@@ -45,7 +45,7 @@ - (id)performSelectorOnMainThread:(SEL)selector withArguments:(NSArray *)argumen
     [invocation setTarget:self];
     [invocation retainArguments];
     
-    for (int currentIndex; currentIndex < arguments.count; currentIndex++) {
+    for (int currentIndex = 0; currentIndex < arguments.count; currentIndex++) {
         id currentArgument = [arguments objectAtIndex:currentIndex];
         [invocation setArgument:&currentArgument atIndex:currentIndex];
     }
diff --git a/Additions/NSString+STAdditions.m b/Additions/NSString+STAdditions.m
index 61daca8..80464ee 100644
--- a/Additions/NSString+STAdditions.m
+++ b/Additions/NSString+STAdditions.m
@@ -27,7 +27,10 @@
 //
 
 #import "STUtils.h"
+#include <CommonCrypto/CommonDigest.h>
 
+// Get this from: https://github.com/nicklockwood/Base64.git
+#import "Base64.h"
 
 @implementation NSString (STAdditions)
 
@@ -271,12 +274,12 @@ - (NSDate *)ISO8601DateValue;
 
 - (CGSize)drawInRect:(CGRect)inRect withFont:(UIFont *)inFont color:(UIColor *)inColor shadowColor:(UIColor *)inShadowColor shadowOffset:(CGSize)inShadowOffset;
 {
-    return [self drawInRect:inRect withFont:inFont lineBreakMode:UILineBreakModeTailTruncation alignment:UITextAlignmentLeft color:inColor shadowColor:inShadowColor shadowOffset:inShadowOffset];
+    return [self drawInRect:inRect withFont:inFont lineBreakMode:NSLineBreakByTruncatingTail alignment:NSTextAlignmentLeft color:inColor shadowColor:inShadowColor shadowOffset:inShadowOffset];
 }
 
 - (CGSize)drawInRect:(CGRect)inRect withFont:(UIFont *)inFont lineBreakMode:(UILineBreakMode)inLineBreakMode color:(UIColor *)inColor shadowColor:(UIColor *)inShadowColor shadowOffset:(CGSize)inShadowOffset;
 {
-    return [self drawInRect:inRect withFont:inFont lineBreakMode:inLineBreakMode alignment:UITextAlignmentLeft color:inColor shadowColor:inShadowColor shadowOffset:inShadowOffset];
+    return [self drawInRect:inRect withFont:inFont lineBreakMode:inLineBreakMode alignment:NSTextAlignmentLeft color:inColor shadowColor:inShadowColor shadowOffset:inShadowOffset];
 }
 
 - (CGSize)drawInRect:(CGRect)inRect withFont:(UIFont *)inFont lineBreakMode:(UILineBreakMode)inLineBreakMode alignment:(UITextAlignment)alignment color:(UIColor *)inColor shadowColor:(UIColor *)inShadowColor shadowOffset:(CGSize)inShadowOffset;
diff --git a/iOS/UIKit/STEditableTableViewCell.m b/iOS/UIKit/STEditableTableViewCell.m
index f7a5921..a83d7b9 100644
--- a/iOS/UIKit/STEditableTableViewCell.m
+++ b/iOS/UIKit/STEditableTableViewCell.m
@@ -61,7 +61,7 @@ - (id)initWithDelegate:(id)inDelegate;
     [label release];
     
     UITextField *entryField = [[UITextField alloc] initWithFrame:CGRectZero];
-    entryField.textColor = [UIColor tableCellEditableTextColor];
+    entryField.textColor = [UIColor blackColor];
     entryField.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
     entryField.font = [UIFont systemFontOfSize:16.0];
     entryField.delegate = inDelegate;