Some fixes to changing between main graphs on same runtime