diff --git a/gst/rtmp2/rtmp/amf.c b/gst/rtmp2/rtmp/amf.c
index a6f5b3be0e..895570f499 100644
--- a/gst/rtmp2/rtmp/amf.c
+++ b/gst/rtmp2/rtmp/amf.c
@@ -893,7 +893,6 @@ gst_amf_parse_command (const guint8 * data, gsize size,
   AmfParser parser = {
     .data = data,
     .size = size,
-    .recursion_depth = 0,
   };
   GstAmfNode *node1 = NULL, *node2 = NULL;
   GPtrArray *args = NULL;
@@ -1119,6 +1118,8 @@ gst_amf_serialize_command_valist (gdouble transaction_id,
   g_return_val_if_fail (command_name, NULL);
   g_return_val_if_fail (argument, NULL);
 
+  init_static ();
+
   GST_LOG ("Serializing command '%s', transid %.0f", command_name,
       transaction_id);
 
diff --git a/gst/rtmp2/rtmp/rtmpconnection.c b/gst/rtmp2/rtmp/rtmpconnection.c
index 8c14516b04..d895f8e5c6 100644
--- a/gst/rtmp2/rtmp/rtmpconnection.c
+++ b/gst/rtmp2/rtmp/rtmpconnection.c
@@ -989,6 +989,8 @@ gst_rtmp_connection_request_window_size (GstRtmpConnection * connection,
     .param = window_ack_size,
   };
 
+  g_return_if_fail (GST_IS_RTMP_CONNECTION (connection));
+
   if (connection->out_window_ack_size == window_ack_size)
     return;