diff --git a/psrdada_cpp/effelsberg/edd/src/DadaBufferLayout.cpp b/psrdada_cpp/effelsberg/edd/src/DadaBufferLayout.cpp
index 5167f131ecbcb097f3368e94eb2de61c9832b34a..abbf5b971cb928646b4f4853ca8cc4c8e0010c66 100644
--- a/psrdada_cpp/effelsberg/edd/src/DadaBufferLayout.cpp
+++ b/psrdada_cpp/effelsberg/edd/src/DadaBufferLayout.cpp
@@ -12,7 +12,7 @@ DadaBufferLayout::DadaBufferLayout(key_t input_key, size_t heapSize, size_t nSid
 {
   MultiLog log("DadaBufferLayout");
   DadaClientBase client(input_key, log);
-  std::size_t _bufferSize = client.data_buffer_size();
+  _bufferSize = client.data_buffer_size();
 
   _sideChannelSize = nSideChannels * sizeof(int64_t);
    size_t totalHeapSize = _heapSize + _sideChannelSize;
@@ -59,7 +59,7 @@ size_t DadaBufferLayout::sizeOfGap() const
 
 size_t DadaBufferLayout::sizeOfSideChannelData() const
 {
-  return _sideChannelSize * _nHeaps * sizeof(uint64_t);
+  return _sideChannelSize * _nHeaps;
 }
 
 size_t DadaBufferLayout::getNHeaps() const