Cleanup.
Fix invalidation in Graphics.