Fixed issues with server processing