Fixed issues related to server side