Changed DrawSurface Surface field to SurfaceId.