Fix some schedule to be sure that everyone is static. Need to try to see if single loops could be avoided