diff --git a/UnleashedRecomp/gpu/video.cpp b/UnleashedRecomp/gpu/video.cpp
index fe06e9f..59773e6 100644
--- a/UnleashedRecomp/gpu/video.cpp
+++ b/UnleashedRecomp/gpu/video.cpp
@@ -1936,7 +1936,7 @@ static void SetVertexDeclaration(GuestDevice* device, GuestVertexDeclaration* ve
         SetDirtyValue(g_dirtyStates.sharedConstants, g_sharedConstants.inputLayoutFlags, vertexDeclaration->inputLayoutFlags);
     }
     SetDirtyValue(g_dirtyStates.pipelineState, g_pipelineState.vertexDeclaration, vertexDeclaration);
-    device->vertexDeclaration = vertexDeclaration;
+    device->vertexDeclaration = g_memory.MapVirtual(vertexDeclaration);
 }
 
 static GuestShader* CreateShader(const be<uint32_t>* function, ResourceType resourceType)
@@ -2425,8 +2425,6 @@ static void MakePictureData(GuestPictureData* pictureData, uint8_t* data, uint32
             pictureData->texture = g_memory.MapVirtual(texture);
             pictureData->type = 0;
         }
-
-        pictureData->flags |= 0x1;
     }
 }
 
diff --git a/UnleashedRecomp/gpu/video.h b/UnleashedRecomp/gpu/video.h
index 508f4d8..e48c4b9 100644
--- a/UnleashedRecomp/gpu/video.h
+++ b/UnleashedRecomp/gpu/video.h
@@ -30,7 +30,7 @@ struct GuestDevice
     be<uint32_t> pixelShaderBoolConstants[0x4];
 
     uint8_t padding27A0[0x68C];
-    struct GuestVertexDeclaration* vertexDeclaration;
+    be<uint32_t> vertexDeclaration;
     uint8_t padding2E30[0x2FD0];
 };