Server / Client tweaks