Fix spaces
Fix server stopping management