Server-side tweaks for the xaviorm server