diff --git a/repertory/repertory/include/cli/mount.hpp b/repertory/repertory/include/cli/mount.hpp
index 2adac03f..88aaed58 100644
--- a/repertory/repertory/include/cli/mount.hpp
+++ b/repertory/repertory/include/cli/mount.hpp
@@ -93,7 +93,7 @@ mount(std::vector<const char *> args, std::string data_directory,
         ::ShowWindow(::GetConsoleWindow(), SW_HIDE);
       }
 #endif // defined(_WIN32)
-      const auto drive_args =
+      auto drive_args =
           utils::cli::parse_drive_options(args, prov, data_directory);
       app_config config(prov, data_directory);
 #if defined(_WIN32)
diff --git a/repertory/repertory/main.cpp b/repertory/repertory/main.cpp
index d39931eb..f7ce26b6 100644
--- a/repertory/repertory/main.cpp
+++ b/repertory/repertory/main.cpp
@@ -89,11 +89,14 @@ auto main(int argc, char **argv) -> int {
           remote_host = parts.at(0U);
           try {
             remote_port = utils::string::to_uint16(parts.at(1U));
-            data_directory = utils::path::combine(
+            data_directory =
                 data_directory.empty()
-                    ? app_config::default_data_directory(prov)
-                    : data_directory,
-                {utils::string::replace_copy(unique_id, ':', '_')});
+                    ? utils::path::combine(
+                          app_config::default_data_directory(prov),
+                          {
+                              utils::string::replace_copy(unique_id, ':', '_'),
+                          })
+                    : utils::path::absolute(data_directory);
           } catch (const std::exception &e) {
             std::cerr << (e.what() == nullptr ? "Unable to parse port"
                                               : e.what())