Index: /trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h
===================================================================
--- /trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h	(revision 513)
+++ /trunk/lib/generic_llsc_global_table/include/generic_llsc_global_table.h	(revision 514)
@@ -319,7 +319,7 @@
     {
         // making all slots available by reseting all valid bits
-        std::memset(r_val,  0, sizeof((*r_val) * nb_slots));
-        std::memset(r_addr, 0, sizeof((*r_addr) * nb_slots));
-        std::memset(r_key,  0, sizeof((*r_key) * nb_slots));
+        std::memset(r_val,  0, sizeof(*r_val) * nb_slots);
+        std::memset(r_addr, 0, sizeof(*r_addr) * nb_slots);
+        std::memset(r_key,  0, sizeof(*r_key) * nb_slots);
 
         // init registers
Index: /trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h
===================================================================
--- /trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h	(revision 513)
+++ /trunk/modules/vci_block_device_tsar/caba/source/include/vci_block_device_tsar.h	(revision 514)
@@ -231,4 +231,7 @@
         const uint32_t 	                    burst_size = 64,
         const uint32_t	                    latency = 0);
+
+    ~VciBlockDeviceTsar();
+
 };
 
Index: /trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp
===================================================================
--- /trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp	(revision 513)
+++ /trunk/modules/vci_block_device_tsar/caba/source/src/vci_block_device_tsar.cpp	(revision 514)
@@ -501,4 +501,5 @@
         p_vci_target.cmdack = true;
         p_vci_target.rspval = false;
+        p_vci_target.rdata  = 0;
         break;
     case T_READ_STATUS:
@@ -753,4 +754,10 @@
 } // end constructor
 
+tmpl(/**/)::~VciBlockDeviceTsar()
+{
+    delete [] r_local_buffer;
+}
+
+
 //////////////////////////
 tmpl(void)::print_trace()
