Changes to make the new graphics manager REALLY work.