diff --git a/src/fsfw/serialize/SerialBufferAdapter.cpp b/src/fsfw/serialize/SerialBufferAdapter.cpp
index f87d0812..36c0cef3 100644
--- a/src/fsfw/serialize/SerialBufferAdapter.cpp
+++ b/src/fsfw/serialize/SerialBufferAdapter.cpp
@@ -119,7 +119,8 @@ const uint8_t* SerialBufferAdapter<count_t>::getConstBuffer() const {
 }
 
 template <typename count_t>
-void SerialBufferAdapter<count_t>::setBuffer(const uint8_t* data, count_t len) {
+void SerialBufferAdapter<count_t>::setBuffer(uint8_t* data, count_t len) {
+  this->buffer = data;
   this->constBuffer = data;
   this->bufferLength = len;
 }
diff --git a/src/fsfw/tmtcservices/PusServiceBase.h b/src/fsfw/tmtcservices/PusServiceBase.h
index afad9e03..92ce0d99 100644
--- a/src/fsfw/tmtcservices/PusServiceBase.h
+++ b/src/fsfw/tmtcservices/PusServiceBase.h
@@ -68,7 +68,7 @@ struct PsbParams {
    * a suitable global distributor with the static ID @PusServiceBase::pusDistributor and
    * register itself at that object.
    */
-  PUSDistributorIF* pusDistributor = nullptr;
+  PusDistributorIF* pusDistributor = nullptr;
   TimeWriterIF* timeStamper = nullptr;
 };