diff --git a/platform-independent/c/core/src/mpw-algorithm.c b/platform-independent/c/core/src/mpw-algorithm.c
index 19329c35..cadb6910 100644
--- a/platform-independent/c/core/src/mpw-algorithm.c
+++ b/platform-independent/c/core/src/mpw-algorithm.c
@@ -218,7 +218,7 @@ static const char *mpw_identicon_leftArms[] = { "╔", "╚", "╰", "═" };
 static const char *mpw_identicon_bodies[] = { "█", "░", "▒", "▓", "☺", "☻" };
 static const char *mpw_identicon_rightArms[] = { "╗", "╝", "╯", "═" };
 static const char *mpw_identicon_accessories[] = {
-        "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
+        "◈", "◎", "◐", "◑", "◒", "◓", "☀", "☁", "☂", "☃", "☄", "★", "☆", "☎", "☏", "⎈", "⌂", "☘", "☢", "☣",
         "☕", "⌚", "⌛", "⏰", "⚡", "⛄", "⛅", "☔", "♔", "♕", "♖", "♗", "♘", "♙", "♚", "♛", "♜", "♝", "♞", "♟",
         "♨", "♩", "♪", "♫", "⚐", "⚑", "⚔", "⚖", "⚙", "⚠", "⌘", "⏎", "✄", "✆", "✈", "✉", "✌"
 };
diff --git a/platform-independent/c/core/src/mpw-marshal.c b/platform-independent/c/core/src/mpw-marshal.c
index e6107d5c..4e379e3c 100644
--- a/platform-independent/c/core/src/mpw-marshal.c
+++ b/platform-independent/c/core/src/mpw-marshal.c
@@ -174,13 +174,14 @@ MPMarshalledData *mpw_marshal_data_new() {
     MPMarshalledData *data = malloc( sizeof( MPMarshalledData ) );
     *data = (MPMarshalledData){};
     mpw_marshal_data_set_null( data, NULL );
+    data->is_null = false;
     return data;
 }
 
 MPMarshalledData *mpw_marshal_data_vget(
         MPMarshalledData *data, va_list nodes) {
 
-    MPMarshalledData *parent = data, *child;
+    MPMarshalledData *parent = data, *child = parent;
     for (const char *node; parent && (node = va_arg( nodes, const char * )); parent = child) {
         child = NULL;
 
@@ -203,7 +204,7 @@ MPMarshalledData *mpw_marshal_data_vget(
         }
     }
 
-    return parent;
+    return child;
 }
 
 MPMarshalledData *mpw_marshal_data_get(
@@ -220,7 +221,7 @@ MPMarshalledData *mpw_marshal_data_get(
 const MPMarshalledData *mpw_marshal_data_vfind(
         const MPMarshalledData *data, va_list nodes) {
 
-    const MPMarshalledData *parent = data, *child;
+    const MPMarshalledData *parent = data, *child = parent;
     for (const char *node; parent && (node = va_arg( nodes, const char * )); parent = child) {
         child = NULL;
 
@@ -236,7 +237,7 @@ const MPMarshalledData *mpw_marshal_data_vfind(
             break;
     }
 
-    return parent;
+    return child;
 }
 
 const MPMarshalledData *mpw_marshal_data_find(