diff --git a/src/modelinfo/ModelIndices.h b/src/modelinfo/ModelIndices.h
index 792904fc..fad0ca07 100644
--- a/src/modelinfo/ModelIndices.h
+++ b/src/modelinfo/ModelIndices.h
@@ -35,7 +35,7 @@
 	X("veg_treea1",		MI_TREE3) \
 	X("veg_treeb1",		MI_TREE6) \
 	X("veg_treea3",		MI_TREE8) \
-	X("doc_crane_cab",	MODELID_CRANE_1) \
+	X("doc_crane_cab0",	MODELID_CRANE_1) \
 	X("doc_crane_cab01",	MODELID_CRANE_2) \
 	X("doc_crane_cab02",	MODELID_CRANE_3) \
 	X("doc_crane_cab03",	MODELID_CRANE_4) \
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index f039819c..9b2a768e 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -216,6 +216,10 @@ psGrabScreen(RwCamera *pCamera)
 		RwImageSetFromRaster(pImage, pRaster);
 		return pImage;
 	}
+#else
+	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	if(image)
+		return image;
 #endif
 	return nil;
 }
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index 1fd959f2..a5f721c8 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -257,6 +257,10 @@ psGrabScreen(RwCamera *pCamera)
 		RwImageSetFromRaster(pImage, pRaster);
 		return pImage;
 	}
+#else
+	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	if(image)
+		return image;
 #endif
 	return nil;
 }
diff --git a/vendor/librw b/vendor/librw
index 78d540fc..9260bddc 160000
--- a/vendor/librw
+++ b/vendor/librw
@@ -1 +1 @@
-Subproject commit 78d540fce0ca090b07377cee40d73eadfb7a699d
+Subproject commit 9260bddc66f70eb51adf0749fa835fed1562c178