diff --git a/ngx_rtmp_handler.c b/ngx_rtmp_handler.c
index 0ab3b3f..fd65e4b 100644
--- a/ngx_rtmp_handler.c
+++ b/ngx_rtmp_handler.c
@@ -654,6 +654,7 @@ ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
 
     hsize = hdrsize[fmt];
 
+    (void) nbufs;
     ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
             "RTMP prep %s (%d) fmt=%d csid=%uD timestamp=%uD "
             "mlen=%uD msid=%uD nbufs=%d",
diff --git a/ngx_rtmp_receive.c b/ngx_rtmp_receive.c
index 0b87b6f..1e146f0 100644
--- a/ngx_rtmp_receive.c
+++ b/ngx_rtmp_receive.c
@@ -405,14 +405,15 @@ ngx_rtmp_amf_message_handler(ngx_rtmp_session_t *s,
 
         while (cl) {
             amf_len += cl->buf->last - cl->buf->pos;
-            if (amf_len >= 8) {
+            /* type: 1B, number payload: 8B */
+            if (amf_len >= 9) {
                 break;
             }
 
             cl = cl->next;
         }
 
-        if (amf_len < 8) {
+        if (amf_len < 9) {
             ngx_log_error(NGX_LOG_WARN, s->connection->log, 0,
                           "AMF malformed: type=%d, length=%D, ignored",
                           NGX_RTMP_AMF_NUMBER, amf_len);