Index: src/OFDictionary.m
==================================================================
--- src/OFDictionary.m
+++ src/OFDictionary.m
@@ -147,11 +147,11 @@
 
 	@try {
 		uint32_t i;
 		BUCKET *b;
 
-		if (key == nil || object == nil)
+		if (key == nil || obj == nil)
 			@throw [OFInvalidArgumentException newWithClass: isa
 							       selector: _cmd];
 
 		data = [self allocMemoryForNItems: 2
 					 withSize: sizeof(BUCKET*)];

Index: src/of_asprintf.m
==================================================================
--- src/of_asprintf.m
+++ src/of_asprintf.m
@@ -236,14 +236,14 @@
 
 		break;
 #endif
 #ifdef OF_IOS
 	case 'q': /* iOS uses this for PRI?64 */
-		if (!appendSubformat(ctx, ctx->format + ctx->i, 1))
+		if (!append_subfmt(ctx, ctx->fmt + ctx->i, 1))
 			return false;
 
-		ctx->lengthModifier = LENGTH_MODIFIER_LL;
+		ctx->len_mod = LENGTH_MODIFIER_LL;
 
 		break;
 #endif
 	default:
 		ctx->i--;