diff --git a/hdmv/hdmv.c b/hdmv/hdmv.c
index d0027cf..bcab275 100644
--- a/hdmv/hdmv.c
+++ b/hdmv/hdmv.c
@@ -31,7 +31,7 @@ int ts_setup_hdmv_lpcm_stream( ts_writer_t *w, int pid, int num_channels, int sa
         return -1;
     }
 
-    stream->lpcm_ctx = calloc( 1, sizeof(stream->lpcm_ctx) );
+    stream->lpcm_ctx = calloc( 1, sizeof(*stream->lpcm_ctx) );
     if( !stream->lpcm_ctx )
         return -1;
 
@@ -44,7 +44,7 @@ int ts_setup_hdmv_lpcm_stream( ts_writer_t *w, int pid, int num_channels, int sa
 
 int ts_setup_dtcp( ts_writer_t *w, uint8_t byte_1, uint8_t byte_2 )
 {
-    w->dtcp_ctx = calloc( 1, sizeof(w->dtcp_ctx) );
+    w->dtcp_ctx = calloc( 1, sizeof(*w->dtcp_ctx) );
     if( !w->dtcp_ctx )
         return -1;
 
diff --git a/libmpegts.c b/libmpegts.c
index e4cfea8..4f90b62 100644
--- a/libmpegts.c
+++ b/libmpegts.c
@@ -1532,7 +1532,7 @@ int ts_write_frames( ts_writer_t *w, ts_frame_t *frames, int num_frames, uint8_t
 
     if( num_frames )
     {
-        ts_int_pes_t **tmp = realloc( w->buffered_frames, (w->num_buffered_frames+num_frames) * sizeof(w->buffered_frames) );
+        ts_int_pes_t **tmp = realloc( w->buffered_frames, (w->num_buffered_frames+num_frames) * sizeof(w->buffered_frames[0]) );
         if( !tmp )
         {
            fprintf( stderr, "Malloc failed\n" );