Minor modifications on server's fonctions