Minor updates in wake of LifeStuff to Client rename.