diff --git a/app/system/resources/classes/system_dashboard_service.php b/app/system/resources/classes/system_dashboard_service.php
index 5cbdffd06c..3722eaf1af 100644
--- a/app/system/resources/classes/system_dashboard_service.php
+++ b/app/system/resources/classes/system_dashboard_service.php
@@ -122,12 +122,12 @@ class system_dashboard_service extends base_websocket_system_service {
 			// wait until we connect again
 			while (!$this->connect_to_ws_server()) {
 				if ($show_disconnect_message) {
-					$this->warn("Websocket server disconnected");
+					$this->warning("Websocket server disconnected");
 					$show_disconnect_message = false;
 				}
 				sleep(1);
 			}
-			$this->warn("Websocket server connected");
+			$this->warning("Websocket server connected");
 		}
 
 		// return a timer value so another timer will be set
@@ -180,12 +180,12 @@ class system_dashboard_service extends base_websocket_system_service {
 			// wait until we connect again
 			while (!$this->connect_to_ws_server()) {
 				if ($show_disconnect_message) {
-					$this->warn("Websocket server disconnected");
+					$this->warning("Websocket server disconnected");
 					$show_disconnect_message = false;
 				}
 				sleep(1);
 			}
-			$this->warn("Websocket server connected");
+			$this->warning("Websocket server connected");
 		}
 
 		// return a timer value so another timer will be set
diff --git a/core/websockets/resources/classes/base_websocket_system_service.php b/core/websockets/resources/classes/base_websocket_system_service.php
index 5c03529a9c..195d5a2de1 100644
--- a/core/websockets/resources/classes/base_websocket_system_service.php
+++ b/core/websockets/resources/classes/base_websocket_system_service.php
@@ -135,7 +135,7 @@ abstract class base_websocket_system_service extends service implements websocke
 
 			if ($this->ws_client !== null && $this->ws_client->is_connected()) {
 				// Combine the websocket client and the listeners into a single array
-				$read = array_merge($listeners, $this->ws_client->socket());
+				$read = array_merge($listeners, [$this->ws_client->socket()]);
 				// Reset the suppress message flag
 				$suppress_ws_message = false;
 			}