Fixes in server