More work for getting RawSurfaces to work