diff --git a/containers/core/containers_bytestream.h b/containers/core/containers_bytestream.h
index 1f20863..95b3a61 100644
--- a/containers/core/containers_bytestream.h
+++ b/containers/core/containers_bytestream.h
@@ -329,9 +329,9 @@ STATIC_INLINE VC_CONTAINER_STATUS_T packet_get_byte( VC_CONTAINER_BYTESTREAM_T *
 STATIC_INLINE VC_CONTAINER_STATUS_T bytestream_find_startcode( VC_CONTAINER_BYTESTREAM_T *stream,
    size_t *search_offset, const uint8_t *startcode, unsigned int length )
 {
-   VC_CONTAINER_PACKET_T *packet, *backup_packet;
+   VC_CONTAINER_PACKET_T *packet, *backup_packet = NULL;
    size_t position, start_offset = position = *search_offset;
-   size_t offset, backup_offset;
+   size_t offset, backup_offset = 0;
    unsigned int match = 0;
 
    if( stream->bytes - stream->current_offset - stream->offset < start_offset + length )
diff --git a/interface/vmcs_host/vcilcs.c b/interface/vmcs_host/vcilcs.c
index ee78a24..980a21d 100644
--- a/interface/vmcs_host/vcilcs.c
+++ b/interface/vmcs_host/vcilcs.c
@@ -543,7 +543,7 @@ static int ilcs_process_message(ILCS_SERVICE_T *st, int block)
  * -------------------------------------------------------------------- */
 static void ilcs_response(ILCS_SERVICE_T *st, uint32_t xid, const unsigned char *msg, int len)
 {
-   ILCS_WAIT_T *wait;
+   ILCS_WAIT_T *wait = NULL;
    int i, copy = len;
 
    // atomically retrieve given ->wait entry