Client/Server fixes.