diff --git a/amp-embedded-infra-lib b/amp-embedded-infra-lib
index b978fac..86de861 160000
--- a/amp-embedded-infra-lib
+++ b/amp-embedded-infra-lib
@@ -1 +1 @@
-Subproject commit b978facccb37a6104be989ae2770c775ca4a6e1f
+Subproject commit 86de861641fb98708b3acb5b22edc79ac00a66ee
diff --git a/amp-hal-st b/amp-hal-st
index 5487665..c98345b 160000
--- a/amp-hal-st
+++ b/amp-hal-st
@@ -1 +1 @@
-Subproject commit 5487665f272ffc8ee388550a0b8ff9c01be76f40
+Subproject commit c98345ba1f413201d350f55ff6b733fe8ab5e79f
diff --git a/amp-preview b/amp-preview
index 617dc26..85b0f61 160000
--- a/amp-preview
+++ b/amp-preview
@@ -1 +1 @@
-Subproject commit 617dc266bef06d584cab01c7b5da275418e48bf0
+Subproject commit 85b0f6136cf69ddf55d3baa8f05423609c5d2bdb
diff --git a/postmaster/programmer/FirmwareReceptorResetTarget.hpp b/postmaster/programmer/FirmwareReceptorResetTarget.hpp
index e41dd2f..83814ac 100644
--- a/postmaster/programmer/FirmwareReceptorResetTarget.hpp
+++ b/postmaster/programmer/FirmwareReceptorResetTarget.hpp
@@ -1,7 +1,6 @@
 #include "hal/interfaces/Gpio.hpp"
 #include "infra/timer/Timer.hpp"
 #include "infra/util/AutoResetFunction.hpp"
-#include "infra/util/Optional.hpp"
 #include "infra/util/ProxyCreator.hpp"
 #include "postmaster/programmer/FirmwareReceptor.hpp"
 
@@ -13,9 +12,9 @@ namespace application
     public:
         FirmwareReceptorResetTarget(hal::GpioPin& reset, hal::GpioPin& boot0, infra::CreatorBase<FirmwareReceptor, void()>& delegateCreator);
 
-        virtual void ReceptionStarted() override;
-        virtual void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
-        virtual void ReceptionStopped(const infra::Function<void()>& onDone) override;
+        void ReceptionStarted() override;
+        void DataReceived(infra::SharedPtr<infra::StreamReaderWithRewinding>&& reader) override;
+        void ReceptionStopped(const infra::Function<void()>& onDone) override;
 
     private:
         hal::GpioPin& reset;
diff --git a/postmaster/programmer/TargetUartConnection.cpp b/postmaster/programmer/TargetUartConnection.cpp
index e0dfc86..f42950a 100644
--- a/postmaster/programmer/TargetUartConnection.cpp
+++ b/postmaster/programmer/TargetUartConnection.cpp
@@ -11,7 +11,7 @@ namespace application
     {
         serial.ReceiveData([this](infra::ConstByteRange data)
             {
-                data.shrink_from_back_to(queue.EmptySize() - queue.Size());
+                data.shrink_from_back_to(queue.Capacity() - queue.Size());
                 queue.AddFromInterrupt(data);
             });
     }