Fix several bugs due to the switch to the master branch of Simgrid - Adrien