diff --git a/src/Compositor.cpp b/src/Compositor.cpp
index d12cf288..dca964b6 100644
--- a/src/Compositor.cpp
+++ b/src/Compositor.cpp
@@ -500,7 +500,7 @@ void CCompositor::sanityCheckWorkspaces() {
 int CCompositor::getWindowsOnWorkspace(const int& id) {
     int no = 0;
     for (auto& w : m_lWindows) {
-        if (w.m_iWorkspaceID == id)
+        if (w.m_iWorkspaceID == id && w.m_bIsMapped)
             no++;
     }
 
diff --git a/src/wlrunstable/wlr_ext_workspace_v1.cpp b/src/wlrunstable/wlr_ext_workspace_v1.cpp
index d549b42a..4d6de7ae 100644
--- a/src/wlrunstable/wlr_ext_workspace_v1.cpp
+++ b/src/wlrunstable/wlr_ext_workspace_v1.cpp
@@ -541,7 +541,7 @@ static struct wlr_ext_workspace_manager_v1 *manager_from_resource(
 	return (wlr_ext_workspace_manager_v1 *)wl_resource_get_user_data(resource);
 }
 
-static void rworkspace_manager_commit(struct wl_client *client,
+static void workspace_manager_commit(struct wl_client *client,
 		struct wl_resource *resource) {
 	struct wlr_ext_workspace_manager_v1 *manager = manager_from_resource(resource);
 	if (!manager) {