minor server-side tweaks