fixes for server part