--- a/branches/Axiom_Upgrade_0.8.0/mvsm/OceanPage.cs
+++ b/branches/Axiom_Upgrade_0.8.0/mvsm/OceanPage.cs
@@ -213,8 +213,8 @@
 
             // create a new vertex buffer (based on current API)
             HardwareVertexBuffer vbuf =
-                HardwareBufferManager.Instance.CreateVertexBuffer(vertexDecl.GetVertexSize(0), vertexData.vertexCount, BufferUsage.StaticWriteOnly, false);
-
+                HardwareBufferManager.Instance.CreateVertexBuffer(vertexDecl, vertexData.vertexCount, BufferUsage.StaticWriteOnly, false);
+            // HardwareBufferManager.Instance.CreateVertexBuffer(vertexDecl.GetVertexSize(0), vertexData.vertexCount, BufferUsage.StaticWriteOnly, false);
             // get a reference to the vertex buffer binding
             VertexBufferBinding binding = vertexData.vertexBufferBinding;
 
@@ -225,7 +225,7 @@
             unsafe
             {
                 // lock the vertex buffer
-                IntPtr data = vbuf.Lock(BufferLocking.Discard);
+                IntPtr data = (IntPtr)vbuf.Lock(BufferLocking.Discard).Ptr;
 
                 float* pData = (float*)data.ToPointer();
 
@@ -270,7 +270,7 @@
             HardwareIndexBuffer idxBuffer = indexData.indexBuffer;
 
             // lock the whole index buffer
-            IntPtr data = idxBuffer.Lock(BufferLocking.Discard);
+            IntPtr data = (IntPtr)idxBuffer.Lock(BufferLocking.Discard).Ptr;
             int startIndex = 0;
 
             unsafe