Bug fixes in the server
Introduced conventions