diff --git a/src/remote/client/interface.cpp b/src/remote/client/interface.cpp
index 84cdf1f6bf..e073978b65 100644
--- a/src/remote/client/interface.cpp
+++ b/src/remote/client/interface.cpp
@@ -158,9 +158,9 @@ namespace {
 		  PortsCleanup(p)
 		{}
 
-		void closePort(rem_port* port) override;
+		void closePort(rem_port* port);
 
-		void delay() override
+		void delay()
 		{
 			Thread::sleep(50);
 		}
@@ -5993,13 +5993,13 @@ static void finalize(rem_port* port)
 		}
 		REMOTE_free_packet(port, packet);
 		delete rdb;
-		port->port_context = nullptr;
+		port->port_context = NULL;
 	}
 
 	// Cleanup the queue
 
 	delete port->port_deferred_packets;
-	port->port_deferred_packets = nullptr;
+	port->port_deferred_packets = NULL;
 
 	port->port_flags |= PORT_detached;
 }
diff --git a/src/remote/remote.cpp b/src/remote/remote.cpp
index c63e833423..64d6f1212b 100644
--- a/src/remote/remote.cpp
+++ b/src/remote/remote.cpp
@@ -799,7 +799,7 @@ void PortsCleanup::closePorts()
 		delay();
 
 	Firebird::MutexLockGuard guard(m_mutex, FB_FUNCTION);
-	Firebird::AutoSetRestore cl(&closing, true);
+	Firebird::AutoSetRestore<bool> cl(&closing, true);
 
 	{ // scope
 		Firebird::MutexUnlockGuard g2(m_mutex, FB_FUNCTION);