Fixes to GraphicsEngine