some corrections on the server sidede