diff --git a/node-graph/graphene-cli/Cargo.toml b/node-graph/graphene-cli/Cargo.toml
index ba53f2cee..df74e56f0 100644
--- a/node-graph/graphene-cli/Cargo.toml
+++ b/node-graph/graphene-cli/Cargo.toml
@@ -15,6 +15,7 @@ gpu = [
 ]
 default = ["wgpu"]
 wgpu = ["wgpu-executor", "gpu"]
+wayland = ["graphene-std/wayland"]
 
 
 [dependencies]
@@ -26,6 +27,7 @@ bezier-rs = { path = "../../libraries/bezier-rs" }
 glam = { version = "0.22", features = ["serde"] }
 
 # Node graph
+graphene-std = { path = "../gstd" }
 image = { version = "0.24", default-features = false, features = [
 	"bmp",
 	"png",
@@ -36,7 +38,6 @@ gpu-executor = { path = "../gpu-executor", optional = true }
 interpreted-executor = { path = "../interpreted-executor" }
 dyn-any = { path = "../../libraries/dyn-any" }
 graphene-core = { path = "../gcore" }
-graphene-std = { path = "../gstd", features = [] }
 future-executor = { path = "../future-executor", optional = true }
 
 wasm-bindgen = { version = "0.2.86", optional = true }
diff --git a/node-graph/wgpu-executor/src/lib.rs b/node-graph/wgpu-executor/src/lib.rs
index 5441c95fc..bd4f31a59 100644
--- a/node-graph/wgpu-executor/src/lib.rs
+++ b/node-graph/wgpu-executor/src/lib.rs
@@ -450,14 +450,15 @@ impl gpu_executor::GpuExecutor for WgpuExecutor {
 	fn create_surface(&self, window: SurfaceHandle<Self::Window>) -> Result<SurfaceHandle<wgpu::Surface>> {
 		let surface = unsafe { self.context.instance.create_surface(window.surface.as_ref()) }?;
 
+		let size = window.surface.inner_size();
 		let surface_caps = surface.get_capabilities(&self.context.adapter);
 		println!("{:?}", surface_caps);
 		let surface_format = wgpu::TextureFormat::Bgra8Unorm;
 		let config = wgpu::SurfaceConfiguration {
 			usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
 			format: surface_format,
-			width: 1920,
-			height: 1080,
+			width: size.width,
+			height: size.height,
 			present_mode: surface_caps.present_modes[0],
 			alpha_mode: surface_caps.alpha_modes[0],
 			view_formats: vec![],