More use of SurfacePtr