Some fixues for server