Fixes for multiple clients.