diff --git a/src/libcharon/plugins/uci/uci_parser.c b/src/libcharon/plugins/uci/uci_parser.c
index 0689642d0..c34c897b0 100644
--- a/src/libcharon/plugins/uci/uci_parser.c
+++ b/src/libcharon/plugins/uci/uci_parser.c
@@ -76,7 +76,7 @@ METHOD(enumerator_t, section_enumerator_enumerate, bool,
 		if (uci_lookup(this->ctx, &element, this->package,
 					   this->current->name, "name") == UCI_OK)
 		{	/* use "name" attribute as config name if available ... */
-			*value = uci_to_option(element)->value;
+			*value = uci_to_option(element)->v.string;
 		}
 		else
 		{	/* ... or the section name becomes config name */
@@ -91,7 +91,7 @@ METHOD(enumerator_t, section_enumerator_enumerate, bool,
 		if (value && uci_lookup(this->ctx, &element, this->package,
 						  this->current->name, this->keywords[i]) == UCI_OK)
 		{
-			*value = uci_to_option(element)->value;
+			*value = uci_to_option(element)->v.string;
 		}
 	}
 
diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_common.h b/src/libstrongswan/plugins/wolfssl/wolfssl_common.h
index 9c944e711..98a5593aa 100644
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_common.h
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_common.h
@@ -80,7 +80,4 @@ typedef union {
 
 #undef PARSE_ERROR
 
-/* Eliminate macro conflicts */
-#undef RNG
-
 #endif /* WOLFSSL_PLUGIN_COMMON_H_ */
diff --git a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
index d4b4989b0..fa4edeeef 100644
--- a/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
+++ b/src/libstrongswan/plugins/wolfssl/wolfssl_plugin.c
@@ -47,6 +47,8 @@
 
 #include <wolfssl/ssl.h>
 
+#undef RNG
+
 #ifndef FIPS_MODE
 #define FIPS_MODE 0
 #endif