Fix Client/Server issues.