Some changes in GS and RM in order o accept restarts