diff --git a/src/generators/nodes/Component.ts b/src/generators/nodes/Component.ts
index 30278b98de..e1c97fe8b4 100644
--- a/src/generators/nodes/Component.ts
+++ b/src/generators/nodes/Component.ts
@@ -332,6 +332,7 @@ export default class Component extends Node {
 		}
 
 		this.handlers.forEach(handler => {
+			handler.var = block.getUniqueName(`${this.var}_${handler.name}`); // TODO this is hacky
 			handler.render(compiler, block);
 		});
 
diff --git a/src/generators/nodes/Window.ts b/src/generators/nodes/Window.ts
index 447d3405e7..1dc0b32f51 100644
--- a/src/generators/nodes/Window.ts
+++ b/src/generators/nodes/Window.ts
@@ -151,13 +151,13 @@ export default class Window extends Node {
 					if (${lock}) return;
 					${lock} = true;
 				`}
-				${generator.options.dev && `component._updatingReadonlyProperty = true;`}
+				${compiler.options.dev && `component._updatingReadonlyProperty = true;`}
 
 				#component.set({
 					${props}
 				});
 
-				${generator.options.dev && `component._updatingReadonlyProperty = false;`}
+				${compiler.options.dev && `component._updatingReadonlyProperty = false;`}
 				${event === 'scroll' && `${lock} = false;`}
 			`;
 
@@ -207,7 +207,7 @@ export default class Window extends Node {
 			`);
 
 			// add initial value
-			generator.metaBindings.push(
+			compiler.metaBindings.push(
 				`this._state.${bindings.online} = navigator.onLine;`
 			);