Engine::Some fixes with GUI mode, should work now