more fixes in server