diff --git a/src/source_package_publishing_history.cpp b/src/source_package_publishing_history.cpp
index 96b67b1..a620711 100644
--- a/src/source_package_publishing_history.cpp
+++ b/src/source_package_publishing_history.cpp
@@ -25,7 +25,7 @@ source_package_publishing_history::source_package_publishing_history()
       source_package_version(""),
       self_link(""),
       lp(nullptr),
-      distro_series([this]() -> std::optional<class distro_series> {
+      distro_series([this]() -> std::optional<distro_series> {
           if (distro_series_link.empty()) return std::nullopt;
           if (_distro_series) return _distro_series;
 
@@ -37,7 +37,7 @@ source_package_publishing_history::source_package_publishing_history()
 
           if (ds) {
               ds->set_lp(lp);
-              _distro_series = std::make_optional(ds.value());
+              _distro_series = std::make_optional(std::move(ds.value()));
               return ds;
           }