Fix issues with some clients.