diff --git a/src/input_handler.cc b/src/input_handler.cc
index 148aa903..98b9f611 100644
--- a/src/input_handler.cc
+++ b/src/input_handler.cc
@@ -517,7 +517,7 @@ public:
         m_context.options().unregister_watcher(*this);
     }
     BufferCompleter(const BufferCompleter&) = delete;
-    BufferCompleter operator=(const BufferCompleter&) = delete;
+    BufferCompleter& operator=(const BufferCompleter&) = delete;
 
     void select(int offset)
     {
diff --git a/src/remote.cc b/src/remote.cc
index d8e7949a..806203af 100644
--- a/src/remote.cc
+++ b/src/remote.cc
@@ -459,9 +459,8 @@ private:
 };
 
 Server::Server()
+    : m_filename{"/tmp/kak-" + int_to_str(getpid())}
 {
-    m_filename = "/tmp/kak-" + int_to_str(getpid());
-
     int listen_sock = socket(AF_UNIX, SOCK_STREAM, 0);
     fcntl(listen_sock, F_SETFD, FD_CLOEXEC);
     sockaddr_un addr;