diff --git a/src/lib-sieve/plugins/copy/ext-copy.c b/src/lib-sieve/plugins/copy/ext-copy.c
index cdfca15752d81e332fbf3b47da4ffe21335b84ef..ad4f7ddc4a00e38983e7e11e02dd4f40fa94a843 100644
--- a/src/lib-sieve/plugins/copy/ext-copy.c
+++ b/src/lib-sieve/plugins/copy/ext-copy.c
@@ -26,7 +26,7 @@ static bool ext_copy_validator_load(struct sieve_validator *validator);
 
 /* Extension definitions */
 
-int ext_my_id;
+static int ext_my_id;
 
 const struct sieve_extension copy_extension = { 
 	"copy", 
diff --git a/src/lib-sieve/sieve-address-parts.c b/src/lib-sieve/sieve-address-parts.c
index 32e7eb54c49cba823a3a4ecb298e4e4aee257a69..5e3479f324476075cf3cd8fcb55f9ef49434a1fc 100644
--- a/src/lib-sieve/sieve-address-parts.c
+++ b/src/lib-sieve/sieve-address-parts.c
@@ -145,7 +145,7 @@ bool addrp_validator_load(struct sieve_validator *validator)
 
 void sieve_address_parts_link_tags
 	(struct sieve_validator *validator, 
-		struct sieve_command_registration *cmd_reg, unsigned int id_code) 
+		struct sieve_command_registration *cmd_reg, int id_code) 
 {	
 	sieve_validator_register_tag
 		(validator, cmd_reg, &address_part_tag, id_code); 	
diff --git a/src/lib-sieve/sieve-address-parts.h b/src/lib-sieve/sieve-address-parts.h
index 5c2b4d00e2d58d1e1149a840292d56d4707fc3aa..314225644444d90c9924b9abb52b9a28db925e4e 100644
--- a/src/lib-sieve/sieve-address-parts.h
+++ b/src/lib-sieve/sieve-address-parts.h
@@ -38,12 +38,11 @@ struct sieve_address_part_extension {
 
 void sieve_address_parts_link_tags
 	(struct sieve_validator *validator, 
-		struct sieve_command_registration *cmd_reg,
-		unsigned int id_code);
+		struct sieve_command_registration *cmd_reg, int id_code);
 		
 void sieve_address_part_register
 	(struct sieve_validator *validator, 
-	const struct sieve_address_part *addrp, int ext_id);
+		const struct sieve_address_part *addrp, int ext_id);
 const struct sieve_address_part *sieve_address_part_find
 	(struct sieve_validator *validator, const char *identifier,
 		int *ext_id);
diff --git a/src/lib-sieve/sieve-binary.c b/src/lib-sieve/sieve-binary.c
index 782905cba545af35cd21d41d1d34693a89bd3e4a..ea47008f6d0ffdce61e40621721b9cffd4333cdd 100644
--- a/src/lib-sieve/sieve-binary.c
+++ b/src/lib-sieve/sieve-binary.c
@@ -135,7 +135,7 @@ int sieve_binary_extension_link
 	
 		array_idx_set(&sbin->extensions, (unsigned int) index, &bext);
 		array_idx_set(&sbin->extension_index, (unsigned int) ext_id, &bext);
-	
+
 		return index;
 	}
 	
@@ -167,7 +167,7 @@ int sieve_binary_extension_get_index
 	
 	if ( ext_id < (int) array_count(&sbin->extension_index) ) {
 		ext = array_idx(&sbin->extension_index, (unsigned int) ext_id);
-		
+	
 		return (*ext)->index;
 	}
 	
diff --git a/src/lib-sieve/sieve-comparators.c b/src/lib-sieve/sieve-comparators.c
index a85d3bdbabf1753410ef19ce06ec0d9ae8f2eeda..8d2c8de23428b1f29b3611271000a7832257f390 100644
--- a/src/lib-sieve/sieve-comparators.c
+++ b/src/lib-sieve/sieve-comparators.c
@@ -254,7 +254,7 @@ static bool tag_comparator_validate
 
 void sieve_comparators_link_tag
 	(struct sieve_validator *validator, struct sieve_command_registration *cmd_reg,	
-		unsigned int id_code) 
+		int id_code) 
 {
 	sieve_validator_register_tag(validator, cmd_reg, &comparator_tag, id_code); 	
 }
diff --git a/src/lib-sieve/sieve-comparators.h b/src/lib-sieve/sieve-comparators.h
index 66601ee74fddda938dc67f03dec404f3383cb8b9..33cac442287d8ea7a74f5211822e9c40a51dff0b 100644
--- a/src/lib-sieve/sieve-comparators.h
+++ b/src/lib-sieve/sieve-comparators.h
@@ -53,8 +53,7 @@ extern const struct sieve_argument comparator_tag;
 
 void sieve_comparators_link_tag
 	(struct sieve_validator *validator, 
-		struct sieve_command_registration *cmd_reg,	
-		unsigned int id_code);
+		struct sieve_command_registration *cmd_reg,	int id_code);
 inline bool sieve_comparator_tag_is
 	(struct sieve_ast_argument *tag, const struct sieve_comparator *cmp);
 inline const struct sieve_comparator *sieve_comparator_tag_get
diff --git a/src/lib-sieve/sieve-extensions.c b/src/lib-sieve/sieve-extensions.c
index b7d4cd10dcb25bbf7618348cdf1c02dfa31271e4..864e47beef06cd491780301b2060d6228e8d6350 100644
--- a/src/lib-sieve/sieve-extensions.c
+++ b/src/lib-sieve/sieve-extensions.c
@@ -139,7 +139,7 @@ int sieve_extension_register(const struct sieve_extension *extension)
 	ereg->id = ext_id;
 	
 	hash_insert(extension_index, (void *) extension->name, (void *) ereg);
-	
+
 	return ext_id;
 }
 
diff --git a/src/lib-sieve/sieve-match-types.c b/src/lib-sieve/sieve-match-types.c
index b36eadc061bc71bfdfe6c6c6be9c060a1b1a0dca..f3b35b00ced145536f9111c855809cb0225090b6 100644
--- a/src/lib-sieve/sieve-match-types.c
+++ b/src/lib-sieve/sieve-match-types.c
@@ -144,7 +144,7 @@ bool mtch_validator_load(struct sieve_validator *validator)
 
 void sieve_match_types_link_tags
 	(struct sieve_validator *validator, 
-		struct sieve_command_registration *cmd_reg, unsigned int id_code) 
+		struct sieve_command_registration *cmd_reg, int id_code) 
 {	
 	sieve_validator_register_tag
 		(validator, cmd_reg, &match_type_tag, id_code); 	
diff --git a/src/lib-sieve/sieve-match-types.h b/src/lib-sieve/sieve-match-types.h
index d60694ba2242b1ddc211681b167b747f0876545e..bd3e31d4ed14c4c400f878878144992e26b2a370 100644
--- a/src/lib-sieve/sieve-match-types.h
+++ b/src/lib-sieve/sieve-match-types.h
@@ -73,8 +73,7 @@ struct sieve_match_type_context {
 
 void sieve_match_types_link_tags
 	(struct sieve_validator *validator, 
-		struct sieve_command_registration *cmd_reg,
-		unsigned int id_code);
+		struct sieve_command_registration *cmd_reg, int id_code);
 bool sieve_match_type_validate_argument
 (struct sieve_validator *validator, struct sieve_ast_argument *arg,
 	struct sieve_ast_argument *key_arg);
diff --git a/src/lib-sieve/sieve-validator.c b/src/lib-sieve/sieve-validator.c
index 12cd6f37d875304b88afe3540e273bb983d6ede4..747e3571827c164b9d8d3d64213fc830ca9d8252 100644
--- a/src/lib-sieve/sieve-validator.c
+++ b/src/lib-sieve/sieve-validator.c
@@ -198,7 +198,7 @@ static const struct sieve_command *
 struct sieve_tag_registration {
 	const struct sieve_argument *tag;
 	
-	unsigned int id_code;
+	int id_code;
 };
 
 static bool _unknown_tag_validate
@@ -215,7 +215,7 @@ static const struct sieve_argument _unknown_tag =
 
 static void _sieve_validator_register_tag
 	(struct sieve_validator *validator, struct sieve_command_registration *cmd_reg, 
-	const struct sieve_argument *tag, const char *identifier, unsigned int id_code) 
+	const struct sieve_argument *tag, const char *identifier, int id_code) 
 {
 	struct sieve_tag_registration *reg;
 	
@@ -233,7 +233,7 @@ static void _sieve_validator_register_tag
 
 void sieve_validator_register_external_tag
 (struct sieve_validator *validator, const struct sieve_argument *tag, 
-	const char *command, unsigned int id_code) 
+	const char *command, int id_code) 
 {
 	struct sieve_command_registration *cmd_reg = 
 		sieve_validator_find_command_registration(validator, command);
@@ -248,7 +248,7 @@ void sieve_validator_register_external_tag
 
 void sieve_validator_register_tag
 	(struct sieve_validator *validator, struct sieve_command_registration *cmd_reg, 
-	const struct sieve_argument *tag, unsigned int id_code) 
+	const struct sieve_argument *tag, int id_code) 
 {
 	if ( tag->is_instance_of == NULL )
 		_sieve_validator_register_tag(validator, cmd_reg, tag, tag->identifier, id_code);
diff --git a/src/lib-sieve/sieve-validator.h b/src/lib-sieve/sieve-validator.h
index 271681bff61fd48006c5348ebe7e5d14596e813f..3a6e1db12e51277a9edec32bae156e788f9304af 100644
--- a/src/lib-sieve/sieve-validator.h
+++ b/src/lib-sieve/sieve-validator.h
@@ -27,12 +27,12 @@ void sieve_validator_register_command
 	(struct sieve_validator *validator, const struct sieve_command *command);
 void sieve_validator_register_external_tag
 	(struct sieve_validator *validator, const struct sieve_argument *tag, 
-		const char *command, unsigned int id_code);
+		const char *command, int id_code);
 
 /* Argument registration */
 void sieve_validator_register_tag
 	(struct sieve_validator *validator, struct sieve_command_registration *cmd_reg, 
-	const struct sieve_argument *argument, unsigned int id_code);
+	const struct sieve_argument *argument, int id_code);
 
 /* Special test arguments */
 void sieve_validator_link_match_type_tags
diff --git a/src/lib-sieve/tst-size.c b/src/lib-sieve/tst-size.c
index cd09f8aacd35a051ec8c8b3345204f2361de22b7..69a5439b23fd7b4ea68b03b7474541d0b4833d19 100644
--- a/src/lib-sieve/tst-size.c
+++ b/src/lib-sieve/tst-size.c
@@ -51,7 +51,7 @@ const struct sieve_opcode tst_size_over_opcode = {
 };
 
 const struct sieve_opcode tst_size_under_opcode = {
-	"SIEVE-UNDER",
+	"SIZE-UNDER",
 	SIEVE_OPCODE_SIZE_UNDER,
 	NULL, 0, 
 	tst_size_opcode_dump,