diff --git a/src/graphics/pipeline.cpp b/src/graphics/pipeline.cpp
index 52dd47c615..48e94b8015 100644
--- a/src/graphics/pipeline.cpp
+++ b/src/graphics/pipeline.cpp
@@ -513,6 +513,7 @@ struct PipelineInstanceImpl : public PipelineInstance
 		{
 			handler.invoke();
 		}
+		finishInstances();
 	}
 
 
diff --git a/src/studio/gameview.cpp b/src/studio/gameview.cpp
index 790f07a54a..a2fad09e8d 100644
--- a/src/studio/gameview.cpp
+++ b/src/studio/gameview.cpp
@@ -42,7 +42,7 @@ void GameView::setWorldEditor(Lumix::WorldEditor& editor)
 {
 	ASSERT(m_editor == nullptr);
 	m_editor = &editor;
-	m_render_device = new WGLRenderDevice(m_editor->getEngine(), "pipelines/game_view.json");
+	m_render_device = new WGLRenderDevice(m_editor->getEngine(), "pipelines/game_view.lua");
 	m_render_device->setWidget(*getContentWidget());
 }
 
diff --git a/src/studio/sceneview.cpp b/src/studio/sceneview.cpp
index 305ad2625e..1ef846314b 100644
--- a/src/studio/sceneview.cpp
+++ b/src/studio/sceneview.cpp
@@ -164,7 +164,7 @@ void SceneView::setWorldEditor(Lumix::WorldEditor& world_editor)
 	static_cast<ViewWidget*>(m_view)->m_world_editor = &world_editor;
 	m_world_editor = &world_editor;
 	m_render_device =
-		new WGLRenderDevice(m_world_editor->getEngine(), "pipelines/main.json");
+		new WGLRenderDevice(m_world_editor->getEngine(), "pipelines/main.lua");
 	world_editor.getMeasureTool()
 		->distanceMeasured()
 		.bind<SceneView, &SceneView::onDistanceMeasured>(this);