diff --git a/trunk/src/app/srs_app_dvr.cpp b/trunk/src/app/srs_app_dvr.cpp
index 9a3af4ef1..2dc7b57dc 100644
--- a/trunk/src/app/srs_app_dvr.cpp
+++ b/trunk/src/app/srs_app_dvr.cpp
@@ -48,6 +48,7 @@ SrsDvrSegmenter::SrsDvrSegmenter()
     req = NULL;
     jitter = NULL;
     plan = NULL;
+    wait_keyframe = true;
     
     fragment = new SrsFragment();
     fs = new SrsFileWriter();
diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
index d59393daf..a2f1c7330 100644
--- a/trunk/src/app/srs_app_edge.cpp
+++ b/trunk/src/app/srs_app_edge.cpp
@@ -440,6 +440,7 @@ SrsEdgeForwarder::SrsEdgeForwarder()
     edge = NULL;
     req = NULL;
     send_error_code = ERROR_SUCCESS;
+    source = NULL;
     
     sdk = NULL;
     lb = new SrsLbRoundRobin();
diff --git a/trunk/src/app/srs_app_rtc_dtls.cpp b/trunk/src/app/srs_app_rtc_dtls.cpp
index 2044987d9..ad72d305d 100644
--- a/trunk/src/app/srs_app_rtc_dtls.cpp
+++ b/trunk/src/app/srs_app_rtc_dtls.cpp
@@ -512,7 +512,7 @@ srs_error_t SrsDtlsImpl::get_srtp_key(std::string& recv_key, std::string& send_k
     unsigned char material[SRTP_MASTER_KEY_LEN * 2] = {0};  // client(SRTP_MASTER_KEY_KEY_LEN + SRTP_MASTER_KEY_SALT_LEN) + server
     static const string dtls_srtp_lable = "EXTRACTOR-dtls_srtp";
     if (!SSL_export_keying_material(dtls, material, sizeof(material), dtls_srtp_lable.c_str(), dtls_srtp_lable.size(), NULL, 0, 0)) {
-        return srs_error_new(ERROR_RTC_SRTP_INIT, "SSL export key r0=%u", ERR_get_error());
+        return srs_error_new(ERROR_RTC_SRTP_INIT, "SSL export key r0=%lu", ERR_get_error());
     }
 
     size_t offset = 0;
diff --git a/trunk/src/kernel/srs_kernel_ts.cpp b/trunk/src/kernel/srs_kernel_ts.cpp
index 27d40315c..6b5280ece 100644
--- a/trunk/src/kernel/srs_kernel_ts.cpp
+++ b/trunk/src/kernel/srs_kernel_ts.cpp
@@ -1275,6 +1275,41 @@ SrsTsPayloadPES::SrsTsPayloadPES(SrsTsPacket* p) : SrsTsPayload(p)
     nb_paddings = 0;
     const2bits = 0x02;
     const1_value0 = 0x07;
+
+    packet_start_code_prefix = 0;
+    stream_id = 0;
+    PES_packet_length = 0;
+    PES_scrambling_control = 0;
+    PES_priority = 0;
+    data_alignment_indicator = 0;
+    copyright = 0;
+    original_or_copy = 0;
+    PTS_DTS_flags = 0;
+    ESCR_flag = 0;
+    ES_rate_flag = 0;
+    DSM_trick_mode_flag = 0;
+    additional_copy_info_flag = 0;
+    PES_CRC_flag = 0;
+    PES_extension_flag = 0;
+    PES_header_data_length = 0;
+    pts = dts = 0;
+    ESCR_base = 0;
+    ESCR_extension = 0;
+    ES_rate = 0;
+    trick_mode_control = 0;
+    trick_mode_value = 0;
+    additional_copy_info = 0;
+    previous_PES_packet_CRC = 0;
+    PES_private_data_flag = 0;
+    pack_header_field_flag = 0;
+    program_packet_sequence_counter_flag = 0;
+    P_STD_buffer_flag = 0;
+    PES_extension_flag_2 = 0;
+    program_packet_sequence_counter = 0;
+    MPEG1_MPEG2_identifier = 0;
+    original_stuff_length = 0;
+    P_STD_buffer_scale = 0;
+    P_STD_buffer_size = 0;
 }
 
 SrsTsPayloadPES::~SrsTsPayloadPES()
diff --git a/trunk/src/protocol/srs_rtmp_handshake.cpp b/trunk/src/protocol/srs_rtmp_handshake.cpp
index 556cd578d..a397941bd 100644
--- a/trunk/src/protocol/srs_rtmp_handshake.cpp
+++ b/trunk/src/protocol/srs_rtmp_handshake.cpp
@@ -978,7 +978,7 @@ namespace _srs_internal
         srs_random_generate(random, 1504);
         
         int size = snprintf(random, 1504, "%s", RTMP_SIG_SRS_HANDSHAKE);
-        srs_assert(++size < 1504);
+        srs_assert(size < 1504);
         snprintf(random + 1504 - size, size, "%s", RTMP_SIG_SRS_HANDSHAKE);
         
         srs_random_generate(digest, 32);