Some tweaks with server