More tweaks & fixes on the server