More Client Changes