Changes to SurfaceManager