Client-Server workarounds