Few tweaks for server