Small changes in GraphicsManager