Minor Changes to surfaceManager