diff --git a/src/lib-sieve/plugins/body/ext-body-common.c b/src/lib-sieve/plugins/body/ext-body-common.c
index 6938213ab8dd72b5d17bd02a15be5ac3a7f1f81f..b92e92a14914a546edf27721f5dd23c35c731f32 100644
--- a/src/lib-sieve/plugins/body/ext-body-common.c
+++ b/src/lib-sieve/plugins/body/ext-body-common.c
@@ -246,7 +246,7 @@ static bool ext_body_parts_add_missing
 	buffer_set_used_size(ctx->tmp_buffer, 0);
 
 	/* Initialize body decoder */
-	decoder = decode_to_plain ? message_decoder_init(FALSE) : NULL;
+	decoder = decode_to_plain ? message_decoder_init(NULL, 0) : NULL;
 
 	//parser = message_parser_init_from_parts(parts, input, 0,
 		//MESSAGE_PARSER_FLAG_INCLUDE_MULTIPART_BLOCKS);
diff --git a/src/lib-sieve/plugins/notify/ext-notify-common.c b/src/lib-sieve/plugins/notify/ext-notify-common.c
index f2b6783ec909af1f328128d7c3c7a5691da24ea1..979b274b4a63f9751831ede6332b29368e3d827e 100644
--- a/src/lib-sieve/plugins/notify/ext-notify-common.c
+++ b/src/lib-sieve/plugins/notify/ext-notify-common.c
@@ -175,7 +175,7 @@ static buffer_t *cmd_notify_extract_body_text
 		return NULL;
 
 	/* Initialize body decoder */
-	decoder = message_decoder_init(FALSE);
+	decoder = message_decoder_init(NULL, 0);
 
 	parser = message_parser_init(mctx->pool, input, 0, 0);
 	is_text = TRUE;
diff --git a/src/lib-sieve/sieve-script-dict.c b/src/lib-sieve/sieve-script-dict.c
index 6586091af3297519c3b3b515ac6959015de4c2f3..489c6bbabb421a777250c289565c289866345a75 100644
--- a/src/lib-sieve/sieve-script-dict.c
+++ b/src/lib-sieve/sieve-script-dict.c
@@ -105,9 +105,9 @@ static int sieve_dict_script_create
 	}
 
 	script->dict_uri = p_strdup(_script->pool, data);
-	script->dict = dict_init
-		(script->dict_uri, DICT_DATA_TYPE_STRING, username, svinst->base_dir);
-	if ( script->dict == NULL ) {
+	ret = dict_init(script->dict_uri, DICT_DATA_TYPE_STRING, username,
+		svinst->base_dir, &script->dict);
+	if ( ret < 0 ) {
 		sieve_critical(svinst, ehandler, name, "failed to open sieve script",
 			"sieve dict backend: failed to initialize dict with data `%s' "
 			"for user `%s'", data, username);