additional server/client tweaks