diff --git a/misc/main.cpp b/misc/main.cpp
index 8d0a688..fec62c2 100644
--- a/misc/main.cpp
+++ b/misc/main.cpp
@@ -67,8 +67,6 @@ int main(int argc, char **argv) {
         }
     }).run();
 
-    /* This is needed to properly free default loop and such resources */
-    uWS::destroy();
 
     std::cout << "Everything fine, falling through" << std::endl;
 
diff --git a/src/HttpResponse.h b/src/HttpResponse.h
index dd3dd5f..5f18058 100644
--- a/src/HttpResponse.h
+++ b/src/HttpResponse.h
@@ -239,10 +239,10 @@ public:
     }
 
     /* Attach handler for aborted HTTP request */
-    HttpResponse *onAborted(std::function<void()> handler) {
+    HttpResponse *onAborted(fu2::unique_function<void()> &&handler) {
         HttpResponseData<SSL> *httpResponseData = getHttpResponseData();
 
-        httpResponseData->onAborted = handler;
+        httpResponseData->onAborted = std::move(handler);
         return this;
     }
 
diff --git a/src/HttpResponseData.h b/src/HttpResponseData.h
index f5bd247..3e455c4 100644
--- a/src/HttpResponseData.h
+++ b/src/HttpResponseData.h
@@ -44,7 +44,7 @@ private:
 
     /* Per socket event handlers */
     fu2::unique_function<bool(int)> onWritable;
-    std::function<void()> onAborted;
+    fu2::unique_function<void()> onAborted;
     //std::function<void()> onData;
 
     std::function<void(std::string_view, bool)> inStream;